forked from AppStateESS/InternshipInventory
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'EditTerms' of https://github.com/oliviaperugini/Interns…
…hipInventory into oliviaperugini-EditTerms
- Loading branch information
Showing
13 changed files
with
13,527 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| UPDATE intern_term SET undergrad_overload_hours=18 WHERE ((undergrad_overload_hours IS NULL) AND (semester_type=1 OR semester_type=4)); | ||
| UPDATE intern_term SET undergrad_overload_hours=7 WHERE ((undergrad_overload_hours IS NULL) AND (semester_type=2 OR semester_type=3)); | ||
| UPDATE intern_term SET grad_overload_hours=12 WHERE ((grad_overload_hours IS NULL) AND (semester_type=1 OR semester_type=4)); | ||
| UPDATE intern_term SET grad_overload_hours=6 WHERE ((grad_overload_hours IS NULL) AND (semester_type=2 OR semester_type=3)); | ||
|
|
||
| ALTER TABLE intern_term ALTER COLUMN undergrad_overload_hours SET NOT NULL; | ||
| ALTER TABLE intern_term ALTER COLUMN grad_overload_hours SET NOT NULL; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,155 @@ | ||
| <?php | ||
|
|
||
| namespace Intern\Command; | ||
| use \phpws2\Database; | ||
|
|
||
| class TermRest { | ||
|
|
||
| public function execute() { | ||
|
|
||
| switch ($_SERVER['REQUEST_METHOD']) { | ||
| case 'POST': | ||
| $this->post(); | ||
| exit; | ||
| case 'GET': | ||
| $data = $this->get(); | ||
| echo (json_encode($data)); | ||
| exit; | ||
| case 'PUT': | ||
| $this->put(); | ||
| exit; | ||
| default: | ||
| header('HTTP/1.1 405 Method Not Allowed'); | ||
| exit; | ||
| } | ||
| } | ||
|
|
||
| // For adding a term. | ||
| // Need to enter: term_code, census date, description, | ||
| // available date, start date, end date, semester type, | ||
| // undergrad overload hours, grad overload hours. | ||
| public function post() { | ||
| $code = $_REQUEST['code']; | ||
| $census = $_REQUEST['census']; | ||
| $descr = $_REQUEST['descr']; | ||
| $available = $_REQUEST['available']; | ||
| $start = $_REQUEST['start']; | ||
| $end = $_REQUEST['end']; | ||
| $type = $_REQUEST['type']; | ||
| $ugradOver = $_REQUEST['ugradOver']; | ||
| $gradOver = $_REQUEST['gradOver']; | ||
|
|
||
|
|
||
| if ($code == '') { | ||
| header('HTTP/1.1 500 Internal Server Error'); | ||
| echo("Missing a term code."); | ||
| exit; | ||
| } | ||
| if ($census == '') { | ||
| header('HTTP/1.1 500 Internal Server Error'); | ||
| echo("Missing a census date."); | ||
| exit; | ||
| } | ||
| if ($descr == '') { | ||
| header('HTTP/1.1 500 Internal Server Error'); | ||
| echo("Missing a term description."); | ||
| exit; | ||
| } | ||
| if ($available == '') { | ||
| header('HTTP/1.1 500 Internal Server Error'); | ||
| echo("Missing an available date."); | ||
| exit; | ||
| } | ||
| if ($start == '') { | ||
| header('HTTP/1.1 500 Internal Server Error'); | ||
| echo("Missing a start date."); | ||
| exit; | ||
| } | ||
| if ($end == '') { | ||
| header('HTTP/1.1 500 Internal Server Error'); | ||
| echo("Missing an end date."); | ||
| exit; | ||
| } | ||
| if ($type == '') { | ||
| header('HTTP/1.1 500 Internal Server Error'); | ||
| echo("Missing a semester type."); | ||
| exit; | ||
| } | ||
| if ($ugradOver == '') { | ||
| header('HTTP/1.1 500 Internal Server Error'); | ||
| echo("Missing undergraduate overload hours."); | ||
| exit; | ||
| } | ||
| if ($gradOver == '') { | ||
| header('HTTP/1.1 500 Internal Server Error'); | ||
| echo("Missing graduate overload hours."); | ||
| exit; | ||
| } | ||
|
|
||
| $db = Database::newDB(); | ||
| $pdo = $db->getPDO(); | ||
|
|
||
| $sql = "INSERT INTO intern_term (term, census_date_timestamp, | ||
| description, available_on_timestamp, start_timestamp, | ||
| end_timestamp, semester_type, undergrad_overload_hours, | ||
| grad_overload_hours) | ||
| VALUES (:code, :census, :descr, :available, :start, :end_date, | ||
| :type, :ugradOver, :gradOver)"; | ||
|
|
||
| $sth = $pdo->prepare($sql); | ||
|
|
||
| $sth->execute(array('code'=>$code, 'census'=>$census, 'descr'=>$descr, | ||
| 'available'=>$available, 'start'=>$start, | ||
| 'end_date'=>$end, 'type'=>$type, 'ugradOver'=>$ugradOver, | ||
| 'gradOver'=>$gradOver)); | ||
| } | ||
|
|
||
| public function get() { | ||
|
|
||
| $db = Database::newDB(); | ||
| $pdo = $db->getPDO(); | ||
|
|
||
| $sql = "SELECT term, description, available_on_timestamp, | ||
| census_date_timestamp, start_timestamp, end_timestamp, | ||
| semester_type, undergrad_overload_hours, grad_overload_hours | ||
| FROM intern_term ORDER BY term DESC"; | ||
|
|
||
| $sth = $pdo->prepare($sql); | ||
| $sth->execute(); | ||
| $result = $sth->fetchAll(\PDO::FETCH_ASSOC); | ||
|
|
||
| return $result; | ||
| } | ||
|
|
||
| public function put() { | ||
| $newTcode = $_REQUEST['newTcode']; | ||
| $newSemtype = $_REQUEST['newSemtype']; | ||
| $newDesc = $_REQUEST['newDesc']; | ||
| $newCensus = $_REQUEST['newCensus']; | ||
| $newAvail = $_REQUEST['newAvail']; | ||
| $newStart = $_REQUEST['newStart']; | ||
| $newEnd = $_REQUEST['newEnd']; | ||
| $newUgradOver = $_REQUEST['newUgradOver']; | ||
| $newGradOver = $_REQUEST['newGradOver']; | ||
| $oldTcode = $_REQUEST['oldTcode']; | ||
|
|
||
| $db = Database::newDB(); | ||
| $pdo = $db->getPDO(); | ||
|
|
||
| $sql = "UPDATE intern_term | ||
| SET term=:newTcode, semester_type=:newSemtype, | ||
| description=:newDesc, census_date_timestamp=:newCensus, | ||
| available_on_timestamp=:newAvail, start_timestamp=:newStart, | ||
| end_timestamp=:newEnd, undergrad_overload_hours=:newUgradOver, | ||
| grad_overload_hours=:newGradOver | ||
| WHERE term=:oldTcode"; | ||
|
|
||
| $sth = $pdo->prepare($sql); | ||
| $sth->execute(array('newTcode'=>$newTcode, 'newSemtype'=>$newSemtype, 'newDesc'=>$newDesc, | ||
| 'newCensus'=>$newCensus, 'newAvail'=>$newAvail, 'newStart'=>$newStart, | ||
| 'newEnd'=>$newEnd, 'newUgradOver'=>$newUgradOver, 'newGradOver'=>$newGradOver, | ||
| 'oldTcode'=>$oldTcode)); | ||
|
|
||
|
|
||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| <?php | ||
|
|
||
| namespace Intern\UI; | ||
|
|
||
| use \Intern\AssetResolver; | ||
|
|
||
| /** | ||
| * Class for handing UI for Term editing and creation | ||
| * @author Olivia Perugini <peruginioc at appstate dot edu> | ||
| **/ | ||
| class TermUI implements UI { | ||
|
|
||
| public function display() { | ||
|
|
||
| // permissions, if needed ? | ||
| //if(!\Current_User::allow('intern', 'edit_terms')){ | ||
| // \NQ::simple('intern', NotifyUI::WARNING, 'You do not have permission to edit terms.'); | ||
| // return false; | ||
| //} | ||
|
|
||
| $tpl = array(); | ||
| $tpl['vendor_bundle'] = AssetResolver::resolveJsPath('assets.json', 'vendor'); | ||
| $tpl['entry_bundle'] = AssetResolver::resolveJsPath('assets.json', 'editTerms'); | ||
| //$tpl['S'] | ||
|
|
||
| return \PHPWS_Template::process($tpl, 'intern', 'edit_terms.tpl'); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.