choteaumt
/
rosehill
mirror of https://github.com/City-of-Bloomington/rosehill.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Interment list now has 50 items per page, and is sortable. Notes are displayed if you're logged in. Add/Update interments are working again 

git-svn-id: https://rosehill.googlecode.com/svn/branches/php@27 100bd78a-fc82-11de-b5bc-ffd2847a4b57
This commit is contained in:
inghamn 2010-01-06 16:16:21 +00:00
parent 31dad3a967
commit 83af615ad8
14 changed files with 249 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
blocks/html/interments/addIntermentForm.inc
View File

@ -1,41 +1,60 @@
<?php <?php
/** /**
* @copyright 2009 City of Bloomington, Indiana * @copyright 2009-2010 City of Bloomington, Indiana
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
* @author Cliff Ingham <inghamn@bloomington.in.gov> * @author Cliff Ingham <inghamn@bloomington.in.gov>
* @param URL $this->return_url
*/ */
$return_url = isset($this->return_url) ? $this->return_url : BASE_URL.'/interments';
?> ?>
<h1>Add Interment</h1> <h1>Add Interment</h1>
<form method="post" action="<?php echo $_SERVER['SCRIPT_NAME']; ?>"> <form method="post" action="<?php echo BASE_URL; ?>/interments/addInterment.php">
<fieldset><legend>Interment Info</legend> <fieldset><legend>Interment Info</legend>
<table> <input type="hidden" name="return_url" value="<?php echo $return_url; ?>" />
<tr><td><label for="interment-section">Section</label></td> <table>
<td><input name="interment[section]" id="interment-section" <tr><td><label for="interment-cemetery_id" class="required">Cemetery</label></td>
size="5" maxlength="5" /> <td><select name="interment[cemetery_id]" id="interment-cemetery_id"
onchange="populateSections(this.options[this.selectedIndex].value)">
<option></option>
<?php
$list = new CemeteryList();
$list->find();
foreach ($list as $cemetery) {
$name = View::escape($cemetery->getName());
echo "<option value=\"{$cemetery->getId()}\">$name</option>";
}
?>
</select>
</td>
</tr>
<tr><td><label for="interment-section_id">Section</label></td>
<td><select name="interment[section_id]" id="interment-section_id">
<option></option>
</select>
<label for="interment-lot">Lot</label> <label for="interment-lot">Lot</label>
<input name="interment[lot]" id="interment-lot" <input name="interment[lot]" id="interment-lot" size="5" maxlength="5" />
size="5" maxlength="5" />
</td> </td>
</tr> </tr>
<tr><td><label for="interment-book">Book</label></td> <tr><td><label for="interment-book">Book</label></td>
<td><input name="interment[book]" id="interment-book" <td><input name="interment[book]" id="interment-book" size="4" maxlength="4" />
size="4" maxlength="4" />
<label for="interment-pageNumber">Page</label> <label for="interment-pageNumber">Page</label>
<input name="interment[pageNumber]" id="interment-pageNumber" <input name="interment[pageNumber]" id="interment-pageNumber" size="5" maxlength="5" />
size="5" maxlength="5" />
</td> </td>
</tr> </tr>
<tr><td><label for="interment-firstname">Name</label></td>
<td><label for="interment-firstname">First</label> <tr><td><label for="interment-firstname">First</label></td>
<input name="interment[firstname]" id="interment-firstname" /> <td><input name="interment[firstname]" id="interment-firstname" /></td>
<label for="interment-middleInitial">MI</label> </tr>
<input name="interment[middleInitial]" id="interment-middleInitial" /> <tr><td><label for="interment-middleInitial">MI</label></td>
<label for="interment-lastname">Last</label> <td><input name="interment[middleInitial]" id="interment-middleInitial" size="1" maxlength="1" />
<input name="interment[lastname]" id="interment-lastname" />
</td> </td>
</tr> </tr>
<tr><td><label for="interment-lastname">Last</label></td>
<td><input name="interment[lastname]" id="interment-lastname" /></td>
</tr>
<tr><td><label for="interment-birthPlace">Place of Birth</label></td> <tr><td><label for="interment-birthPlace">Place of Birth</label></td>
@ -60,33 +79,38 @@
</select> </select>
</td> </td>
</tr> </tr>
<tr><td><label for="interment-cemetery_id">Cemetery</label></td>
<td><select name="interment[cemetery_id]" id="interment-cemetery_id">
<option></option>
<?php
$list = new CemeteryList();
$list->find();
foreach ($list as $cemetery) {
$name = View::escape($cemetery->getName());
echo "<option value=\"{$cemetery->getId()}\">$name</option>";
}
?>
</select>
</td>
</tr>
<tr><td><label for="interment-notes">Notes</label></td>
<td><textarea name="interment[notes]" id="interment-notes" rows="3" cols="60"></textarea>
</td>
</tr>
</table> </table>
<div><label for="interment-notes">Notes</label></div>
<div><textarea name="interment[notes]" id="interment-notes" rows="3" cols="60"></textarea></div>
<button type="submit" class="submit">Submit</button> <button type="submit" class="submit">Submit</button>
<button type="button" class="cancel" onclick="document.location.href='<?php echo BASE_URL; ?>/interments';"> <button type="button" class="cancel" onclick="document.location.href='<?php echo $return_url; ?>';">
Cancel Cancel
</button> </button>
</fieldset> </fieldset>
</form> </form>
<script type="text/javascript">
function populateSections(cemetery_id) {
var url = '<?php echo BASE_URL; ?>/cemeteries/viewCemetery.php?format=json;cemetery_id=' + cemetery_id;
YAHOO.util.Connect.asyncRequest('GET',url,{
success : function (o) {
var select = document.getElementById('interment-section_id');
select.innerHTML = '';
select.appendChild(document.createElement('option'));
var sections = YAHOO.lang.JSON.parse(o.responseText).sections
for (i in sections) {
var option = document.createElement('option');
option.setAttribute('value',sections[i].id);
option.appendChild(document.createTextNode(sections[i].code));
select.appendChild(option);
}
},
failure : function (o) {
}
});
}
</script>

12
blocks/html/interments/intermentList.inc
View File

@ -8,13 +8,16 @@
*/ */
$previousSort = isset($_GET['sort']) ? $_GET['sort'] : 'deceasedDate'; $previousSort = isset($_GET['sort']) ? $_GET['sort'] : 'deceasedDate';
$url = new URL($_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']); $url = new URL($_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']);
$return_url = $url->__toString();
?> ?>
<div class="interfaceBox"> <div class="interfaceBox">
<h1> <h1>
<?php <?php
if (userIsAllowed('Interments')) { if (userIsAllowed('Interments')) {
$addURL = new URL(BASE_URL.'/interments/addInterment.php');
$addURL->return_url = $return_url;
echo " echo "
<button type=\"button\" class=\"add\" onclick=\"document.location.href='".BASE_URL."/interments/addInterment.php';\"> <button type=\"button\" class=\"add\" onclick=\"document.location.href='$addURL';\">
Add Add
</button> </button>
"; ";
@ -49,10 +52,11 @@ $url = new URL($_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']);
foreach ($this->intermentList as $interment) { foreach ($this->intermentList as $interment) {
$editButton = ''; $editButton = '';
if (userIsAllowed('Interments')) { if (userIsAllowed('Interments')) {
$url = new URL(BASE_URL.'/interments/updateInterment.php'); $editURL = new URL(BASE_URL.'/interments/updateInterment.php');
$url->interment_id = $interment->getId(); $editURL->interment_id = $interment->getId();
$editURL->return_url = $return_url;
$editButton = " $editButton = "
<button type=\"button\" class=\"edit\" onclick=\"document.location.href='$url';\"> <button type=\"button\" class=\"edit\" onclick=\"document.location.href='$editURL';\">
Edit Edit
</button> </button>
"; ";

1
blocks/html/interments/maps.inc
View File

@ -34,6 +34,7 @@ if ($zoomed_map) {
} }
else { else {
echo " echo "
<h2>Close-up of Section</h2>
<p> <p>
We do not have information for this burial or we do not have the section currently mapped. We do not have information for this burial or we do not have the section currently mapped.
</p> </p>

116
blocks/html/interments/updateIntermentForm.inc
View File

@ -4,18 +4,50 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
* @author Cliff Ingham <inghamn@bloomington.in.gov> * @author Cliff Ingham <inghamn@bloomington.in.gov>
* @param Interment $this->interment * @param Interment $this->interment
* @param string $this->return_url
*/ */
$return_url = $this->return_url ? $this->return_url : BASE_URL.'/interments';
?> ?>
<h1>Update Interment</h1> <h1>Update Interment</h1>
<form method="post" action="<?php echo $_SERVER['SCRIPT_NAME']; ?>"> <form method="post" action="<?php echo BASE_URL; ?>/interments/updateInterment.php">
<fieldset><legend>Interment Info</legend> <fieldset><legend>Interment Info</legend>
<input name="interment_id" type="hidden" value="<?php echo $this->interment->getId(); ?>" /> <input name="interment_id" type="hidden" value="<?php echo $this->interment->getId(); ?>" />
<input name="return_url" type="hidden" value="<?php echo $return_url; ?>" />
<table> <table>
<tr><td><label for="interment-cemetery_id" class="required">Cemetery</label></td>
<td><select name="interment[cemetery_id]" id="interment-cemetery_id"
onchange="populateSections(this.options[this.selectedIndex].value)">
<option></option>
<?php
$list = new CemeteryList();
$list->find();
foreach ($list as $cemetery) {
$name = View::escape($cemetery->getName());
$selected = $this->interment->getCemetery_id()==$cemetery->getId()
? 'selected="selected"'
: '';
echo "<option value=\"{$cemetery->getId()}\" $selected>$name</option>";
}
?>
</select>
</td>
</tr>
<tr><td><label for="interment-section">Section</label></td> <tr><td><label for="interment-section_id">Section</label></td>
<td><input name="interment[section]" id="interment-section" <td><select name="interment[section_id]" id="interment-section_id">
size="5" maxlength="5" <option></option>
value="<?php echo View::escape($this->interment->getSection()); ?>" /> <?php
if ($this->interment->getSection_id()) {
foreach ($this->interment->getCemetery()->getSections() as $section) {
$name = $section->getName() ? View::escape($section->getName()) : View::escape($section->getCode());
$selected = $section->getId()==$this->interment->getSection_id()
? 'selected="selected"'
: '';
echo "<option value=\"{$section->getId()}\" $selected>$name</option>";
}
}
?>
</select>
<label for="interment-lot">Lot</label> <label for="interment-lot">Lot</label>
<input name="interment[lot]" id="interment-lot" <input name="interment[lot]" id="interment-lot"
size="5" maxlength="5" size="5" maxlength="5"
@ -33,15 +65,20 @@
value="<?php echo View::escape($this->interment->getPageNumber()); ?>" /> value="<?php echo View::escape($this->interment->getPageNumber()); ?>" />
</td> </td>
</tr> </tr>
<tr><td><label for="interment-firstname">Name</label></td>
<td><label for="interment-firstname">First</label> <tr><td><label for="interment-firstname">First</label></td>
<input name="interment[firstname]" id="interment-firstname" <td><input name="interment[firstname]" id="interment-firstname"
value="<?php echo View::escape($this->interment->getFirstname()); ?>" /> value="<?php echo View::escape($this->interment->getFirstname()); ?>" />
<label for="interment-middleInitial">MI</label> </td>
<input name="interment[middleInitial]" id="interment-middleInitial" </tr>
<tr><td><label for="interment-middleInitial">MI</label></td>
<td><input name="interment[middleInitial]" id="interment-middleInitial"
size="1" maxlength="1"
value="<?php echo View::escape($this->interment->getMiddleInitial()); ?>" /> value="<?php echo View::escape($this->interment->getMiddleInitial()); ?>" />
<label for="interment-lastname">Last</label> </td>
<input name="interment[lastname]" id="interment-lastname" </tr>
<tr><td><label for="interment-lastname">Last</label></td>
<td><input name="interment[lastname]" id="interment-lastname"
value="<?php echo View::escape($this->interment->getLastname()); ?>" /> value="<?php echo View::escape($this->interment->getLastname()); ?>" />
</td> </td>
</tr> </tr>
@ -78,35 +115,40 @@
</select> </select>
</td> </td>
</tr> </tr>
<tr><td><label for="interment-cemetery_id">Cemetery</label></td>
<td><select name="interment[cemetery_id]" id="interment-cemetery_id">
<option></option>
<?php
$list = new CemeteryList();
$list->find();
foreach ($list as $cemetery) {
$name = View::escape($cemetery->getName());
$selected = $this->interment->getCemetery_id()==$cemetery->getId()
? 'selected="selected"'
: '';
echo "<option value=\"{$cemetery->getId()}\" $selected>$name</option>";
}
?>
</select>
</td>
</tr>
<tr><td><label for="interment-notes">Notes</label></td>
<td><textarea name="interment[notes]" id="interment-notes" rows="3" cols="60"><?php echo View::escape($this->interment->getNotes()); ?></textarea>
</td>
</tr>
</table> </table>
<div><label for="interment-notes">Notes</label></div>
<div>
<textarea name="interment[notes]" id="interment-notes" rows="3" cols="60"><?php echo View::escape($this->interment->getNotes()); ?></textarea>
</div>
<button type="submit" class="submit">Submit</button> <button type="submit" class="submit">Submit</button>
<button type="button" class="cancel" onclick="document.location.href='<?php echo BASE_URL; ?>/interments';"> <button type="button" class="cancel" onclick="document.location.href='<?php echo $return_url; ?>';">
Cancel Cancel
</button> </button>
</fieldset> </fieldset>
</form> </form>
<script type="text/javascript">
function populateSections(cemetery_id) {
var url = '<?php echo BASE_URL; ?>/cemeteries/viewCemetery.php?format=json;cemetery_id=' + cemetery_id;
YAHOO.util.Connect.asyncRequest('GET',url,{
success : function (o) {
var select = document.getElementById('interment-section_id');
select.innerHTML = '';
select.appendChild(document.createElement('option'));
var sections = YAHOO.lang.JSON.parse(o.responseText).sections
for (i in sections) {
var option = document.createElement('option');
option.setAttribute('value',sections[i].id);
option.appendChild(document.createTextNode(sections[i].code));
select.appendChild(option);
}
},
failure : function (o) {
}
});
}
</script>

22
blocks/json/cemeteries/cemeteryInfo.inc Normal file
View File

@ -0,0 +1,22 @@
<?php
/**
* @copyright 2010 City of Bloomington, Indiana
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
* @author Cliff Ingham <inghamn@bloomington.in.gov>
* @param Cemetery $this->cemetery
*/
$sections = array();
foreach ($this->cemetery->getSections() as $section) {
$code = addslashes($section->getCode());
$name = addslashes($section->getName());
$sections[] = "{\"id\":{$section->getId()},\"code\":\"$code\",\"name\":\"$name\"}";
}
$sections = implode(',',$sections);
$name = addslashes($this->cemetery->getName());
echo "
{ \"id\":{$this->cemetery->getId()},
\"name\":\"$name\",
\"sections\":[$sections]
}
";

27
blocks/xml/cemeteries/cemeteryInfo.inc Normal file
View File

@ -0,0 +1,27 @@
<?php
/**
* @copyright 2010 City of Bloomington, Indiana
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
* @author Cliff Ingham <inghamn@bloomington.in.gov>
* @param Cemetery $this->cemetery
*/
$name = View::escape($this->cemetery->getName());
echo "
<cemetery id=\"{$this->cemetery->getId()}\">
<name>$name</name>
<sections>
";
foreach ($this->cemetery->getSections() as $section) {
$code = View::escape($section->getCode());
$name = View::escape($section->getName());
echo "
<section id=\"{$section->getId()}\">
<code>$code</code>
<name>$name</name>
</section>
";
}
echo "
</sections>
</cemetery>
";

7
classes/Interment.php
View File

@ -77,9 +77,10 @@ class Interment
public function validate() public function validate()
{ {
// Check for required fields here. Throw an exception if anything is missing. // Check for required fields here. Throw an exception if anything is missing.
if (!$this->cemetery_id) {
throw new Exception('missingRequiredFields');
}
} }
/** /**
* Saves this record back to the database * Saves this record back to the database
*/ */
@ -100,7 +101,7 @@ class Interment
$data['lastResidence'] = $this->lastResidence ? $this->lastResidence : null; $data['lastResidence'] = $this->lastResidence ? $this->lastResidence : null;
$data['age'] = $this->age ? $this->age : null; $data['age'] = $this->age ? $this->age : null;
$data['sex'] = $this->sex ? $this->sex : null; $data['sex'] = $this->sex ? $this->sex : null;
$data['cemetery_id'] = $this->cemetery_id ? $this->cemetery_id : null; $data['cemetery_id'] = $this->cemetery_id;
$data['notes'] = $this->notes ? $this->notes : null; $data['notes'] = $this->notes ? $this->notes : null;
$data['lot2'] = $this->lot2 ? $this->lot2 : null; $data['lot2'] = $this->lot2 ? $this->lot2 : null;

9
html/cemeteries/viewCemetery.php
View File

@ -18,6 +18,13 @@ catch (Exception $e) {
exit(); exit();
} }
$template = new Template();
if (isset($_GET['format'])) {
$template = new Template('default',$_GET['format']);
}
else {
$template = new Template();
}
$template->blocks[] = new Block('cemeteries/cemeteryInfo.inc',array('cemetery'=>$cemetery)); $template->blocks[] = new Block('cemeteries/cemeteryInfo.inc',array('cemetery'=>$cemetery));
echo $template->render(); echo $template->render();

9
html/interments/addInterment.php
View File

@ -3,14 +3,16 @@
* @copyright 2009 City of Bloomington, Indiana * @copyright 2009 City of Bloomington, Indiana
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
* @author Cliff Ingham <inghamn@bloomington.in.gov> * @author Cliff Ingham <inghamn@bloomington.in.gov>
* @param REQUEST return_url
*/ */
if (!userIsAllowed('Interments')) { if (!userIsAllowed('Interments')) {
$_SESSION['errorMessages'][] = new Exception('noAccessAllowed'); $_SESSION['errorMessages'][] = new Exception('noAccessAllowed');
header('Location: '.BASE_URL.'/interments'); header('Location: '.BASE_URL.'/interments');
exit(); exit();
} }
$return_url = isset($_REQUEST['return_url']) ? $_REQUEST['return_url'] : BASE_URL.'/interments';
if (isset($_POST['interment'])) { if (isset($_POST['interment'])) {
$interment = new Interment(); $interment = new Interment();
foreach ($_POST['interment'] as $field=>$value) { foreach ($_POST['interment'] as $field=>$value) {
@ -20,7 +22,7 @@ if (isset($_POST['interment'])) {
try { try {
$interment->save(); $interment->save();
header('Location: '.BASE_URL.'/interments'); header("Location: $return_url");
exit(); exit();
} }
catch(Exception $e) { catch(Exception $e) {
@ -29,5 +31,6 @@ if (isset($_POST['interment'])) {
} }
$template = new Template(); $template = new Template();
$template->blocks[] = new Block('interments/addIntermentForm.inc'); $template->blocks[] = new Block('interments/addIntermentForm.inc',
array('return_url'=>$return_url));
echo $template->render(); echo $template->render();

9
html/interments/home.php
View File

@ -36,7 +36,7 @@ foreach ($_GET as $field=>$value) {
if (count($search)) { if (count($search)) {
$order = isset($_GET['sort']) ? $_GET['sort'] : null; $order = isset($_GET['sort']) ? $_GET['sort'] : null;
$intermentList = new IntermentList($search,$order,20,$currentPage); $intermentList = new IntermentList($search,$order,50,$currentPage);
} }
@ -46,5 +46,12 @@ if (isset($intermentList)) {
$template->blocks[] = new Block('interments/intermentList.inc', $template->blocks[] = new Block('interments/intermentList.inc',
array('intermentList'=>$intermentList)); array('intermentList'=>$intermentList));
} }
else {
if (userIsAllowed('Interments')) {
$return_url = new URL($_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']);
$template->blocks[] = new Block('interments/addIntermentForm.inc',
array('return_url'=>$return_url));
}
}
$template->blocks['panel-one'][] = new Block('about.inc'); $template->blocks['panel-one'][] = new Block('about.inc');
echo $template->render(); echo $template->render();

8
html/interments/updateInterment.php
View File

@ -3,6 +3,7 @@
* @copyright 2009 City of Bloomington, Indiana * @copyright 2009 City of Bloomington, Indiana
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
* @author Cliff Ingham <inghamn@bloomington.in.gov> * @author Cliff Ingham <inghamn@bloomington.in.gov>
* @param REQUEST return_url
*/ */
if (!userIsAllowed('Interments')) { if (!userIsAllowed('Interments')) {
$_SESSION['errorMessages'][] = new Exception('noAccessAllowed'); $_SESSION['errorMessages'][] = new Exception('noAccessAllowed');
@ -10,6 +11,8 @@ if (!userIsAllowed('Interments')) {
exit(); exit();
} }
$return_url = isset($_REQUEST['return_url']) ? $_REQUEST['return_url'] : BASE_URL.'/interments';
$interment = new Interment($_REQUEST['interment_id']); $interment = new Interment($_REQUEST['interment_id']);
if (isset($_POST['interment'])) { if (isset($_POST['interment'])) {
foreach ($_POST['interment'] as $field=>$value) { foreach ($_POST['interment'] as $field=>$value) {
@ -19,7 +22,7 @@ if (isset($_POST['interment'])) {
try { try {
$interment->save(); $interment->save();
header('Location: '.BASE_URL.'/interments'); header("Location: $return_url");
exit(); exit();
} }
catch (Exception $e) { catch (Exception $e) {
@ -28,5 +31,6 @@ if (isset($_POST['interment'])) {
} }
$template = new Template(); $template = new Template();
$template->blocks[] = new Block('interments/updateIntermentForm.inc',array('interment'=>$interment)); $template->blocks[] = new Block('interments/updateIntermentForm.inc',
array('interment'=>$interment,'return_url'=>$return_url));
echo $template->render(); echo $template->render();

8
templates/html/partials/header.inc
View File

@ -9,7 +9,11 @@
@import url('/skins/origin-external/screen.css'); @import url('/skins/origin-external/screen.css');
@import url('<?php echo BASE_URL; ?>/skins/local/screen.css'); @import url('<?php echo BASE_URL; ?>/skins/local/screen.css');
</style> </style>
<script type="text/javascript" src="<?php echo BASE_URL; ?>/js/functions.js"></script> <script type="text/javascript" src="http://yui.yahooapis.com/2.8.0r4/build/yahoo/yahoo-min.js"></script>
<script type="text/javascript" src="http://yui.yahooapis.com/2.8.0r4/build/event/event-min.js"></script>
<script type="text/javascript" src="http://yui.yahooapis.com/2.8.0r4/build/json/json-min.js"></script>
<script type="text/javascript" src="http://yui.yahooapis.com/2.8.0r4/build/connection/connection-min.js"></script>
<script type="text/javascript" src="http://yui.yahooapis.com/2.8.0r4/build/datasource/datasource-min.js"></script>
<title>New Application</title> <title>Cemeteries</title>
</head> </head>

2
templates/json/default.inc Normal file
View File

@ -0,0 +1,2 @@
<?php
echo $this->includeBlocks();

3
templates/xml/default.inc Normal file
View File

@ -0,0 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<?php
echo $this->includeBlocks();