new contract

AppStateESS · Apr 26, 2021 · f84574b · f84574b
1 parent d03ffe8
commit f84574b
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 6 deletions.
diff --git a/boost/boost.php b/boost/boost.php
@@ -4,7 +4,7 @@
  */
 
 $proper_name  = 'Internship Inventory';
-$version      = '1.1.1';
+$version      = '1.1.2';
 $register     = false;
 $unregister   = false;
 $import_sql   = true;

diff --git a/class/DataProvider/Student/WebServiceDataProvider.php b/class/DataProvider/Student/WebServiceDataProvider.php
@@ -234,9 +234,9 @@ protected function plugStudentValues(&$student, \stdClass $data){
         }
 
         // Check if level exist, if not add it
-        if(isset($data->studentLevel) && LevelFactory::checkLevelExist($data->studentLevel) && $student->getStudentFlag()){
+        if(isset($data->studentLevel) && LevelFactory::checkLevelExist($data->studentLevel)){
             $student->setLevel($data->studentLevel);
-        } else if(isset($data->studentLevel) && $student->getStudentFlag()) {
+        } else if(isset($data->studentLevel)) {
             $newLevel = LevelFactory::saveNewCode($data->studentLevel);
             $student->setLevel($newLevel);
         }

diff --git a/class/InternshipContractPdfView.php b/class/InternshipContractPdfView.php
@@ -77,7 +77,7 @@ private function generatePdf()
         $f = $this->internship->getFaculty();
         //$subject = $this->internship->getSubject();
 
-        $this->pdf->setSourceFile(PHPWS_SOURCE_DIR . 'mod/intern/pdf/Acknowledgment_Updated_202110.pdf');
+        $this->pdf->setSourceFile(PHPWS_SOURCE_DIR . 'mod/intern/pdf/Acknowledgment_Updated_202120.pdf');
         $tplidx = $this->pdf->importPage(1);
         $this->pdf->addPage();
         $this->pdf->useTemplate($tplidx);

diff --git a/class/Student.php b/class/Student.php
@@ -48,6 +48,7 @@ class Student {
     // Person type flags
     private $isStaff;
     private $isStudent;
+    private $phone;
 
     public function __construct() {
         $this->majors = array();

diff --git a/pdf/Acknowledgment_Updated_202110.pdf b/pdf/Acknowledgment_Updated_202110.pdf
diff --git a/pdf/Acknowledgment_Updated_202120.pdf b/pdf/Acknowledgment_Updated_202120.pdf
diff --git a/templates/internshipView.tpl b/templates/internshipView.tpl
@@ -200,7 +200,7 @@
 
             <div class="col-lg-8 col-lg-offset-3">
               <div class="checkbox">
-                <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>
+                <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>
               </div>
             </div>
             <!-- BEGIN remote-state -->
@@ -211,7 +211,7 @@
             <!-- END remote-state -->
 
             <!-- Informational Modal -->
-            <div id ="partModal" class="modal fade" role="dialog">
+            <div id ="remoteModal" class="modal fade" role="dialog">
               <div class="modal-dialog">
                 <div class = "modal-content">
                   <div class = "modal-header">