Skip to content

Commit f84574b

Browse files
committed
new contract
1 parent d03ffe8 commit f84574b

7 files changed

Lines changed: 7 additions & 6 deletions

File tree

boost/boost.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
$proper_name = 'Internship Inventory';
7-
$version = '1.1.1';
7+
$version = '1.1.2';
88
$register = false;
99
$unregister = false;
1010
$import_sql = true;

class/DataProvider/Student/WebServiceDataProvider.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,9 @@ protected function plugStudentValues(&$student, \stdClass $data){
234234
}
235235

236236
// Check if level exist, if not add it
237-
if(isset($data->studentLevel) && LevelFactory::checkLevelExist($data->studentLevel) && $student->getStudentFlag()){
237+
if(isset($data->studentLevel) && LevelFactory::checkLevelExist($data->studentLevel)){
238238
$student->setLevel($data->studentLevel);
239-
} else if(isset($data->studentLevel) && $student->getStudentFlag()) {
239+
} else if(isset($data->studentLevel)) {
240240
$newLevel = LevelFactory::saveNewCode($data->studentLevel);
241241
$student->setLevel($newLevel);
242242
}

class/InternshipContractPdfView.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ private function generatePdf()
7777
$f = $this->internship->getFaculty();
7878
//$subject = $this->internship->getSubject();
7979

80-
$this->pdf->setSourceFile(PHPWS_SOURCE_DIR . 'mod/intern/pdf/Acknowledgment_Updated_202110.pdf');
80+
$this->pdf->setSourceFile(PHPWS_SOURCE_DIR . 'mod/intern/pdf/Acknowledgment_Updated_202120.pdf');
8181
$tplidx = $this->pdf->importPage(1);
8282
$this->pdf->addPage();
8383
$this->pdf->useTemplate($tplidx);

class/Student.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ class Student {
4848
// Person type flags
4949
private $isStaff;
5050
private $isStudent;
51+
private $phone;
5152

5253
public function __construct() {
5354
$this->majors = array();
-160 KB
Binary file not shown.
161 KB
Binary file not shown.

templates/internshipView.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200

201201
<div class="col-lg-8 col-lg-offset-3">
202202
<div class="checkbox">
203-
<label>{REMOTE}&nbsp;{REMOTE_LABEL_TEXT} </label><a href="#partModal" id="internship-remote-help-button" class="pull-right" data-toggle="modal"><i class="fa fa-question-circle"></i> Explanation</a>
203+
<label>{REMOTE}&nbsp;{REMOTE_LABEL_TEXT} </label><a href="#remoteModal" id="internship-remote-help-button" class="pull-right" data-toggle="modal"><i class="fa fa-question-circle"></i> Explanation</a>
204204
</div>
205205
</div>
206206
<!-- BEGIN remote-state -->
@@ -211,7 +211,7 @@
211211
<!-- END remote-state -->
212212

213213
<!-- Informational Modal -->
214-
<div id ="partModal" class="modal fade" role="dialog">
214+
<div id ="remoteModal" class="modal fade" role="dialog">
215215
<div class="modal-dialog">
216216
<div class = "modal-content">
217217
<div class = "modal-header">

0 commit comments

Comments
 (0)