diff --git a/application/controllers/system/Messages.php b/application/controllers/system/Messages.php index e0642ca02..2c2474a1e 100644 --- a/application/controllers/system/Messages.php +++ b/application/controllers/system/Messages.php @@ -27,8 +27,19 @@ class Messages extends VileSci_Controller /** * write */ - public function write($sender_id, $msg_id = null, $receiver_id = null) + public function write($sender_id = null, $msg_id = null, $receiver_id = null) { + if ($sender_id === null) + { + $user_person = $this->PersonModel->getByUid($this->uid); + + if (isError($user_person)) + { + show_error($user_person->retval); + } + $sender_id = $user_person->retval[0]->person_id; + } + $prestudent_id = $this->input->post('prestudent_id'); $person_id = $this->input->post('person_id'); $personOnly = false; @@ -68,7 +79,7 @@ class Messages extends VileSci_Controller $benutzerResult = $this->BenutzerfunktionModel->getByPersonId($sender_id); if (hasData($benutzerResult)) { - foreach($benutzerResult->retval as $val) + foreach ($benutzerResult->retval as $val) { $oe_kurzbz[] = $val->oe_kurzbz; } @@ -95,6 +106,12 @@ class Messages extends VileSci_Controller $v = $this->load->view('system/messageWrite', $data); } + /** + * gets Message Variables and their data for Prestudent + * @param $prestudent_id + * @param $variablesArray to be filled with variable names + * @param $msgVarsData to be filled with variable data + */ private function getPrestudentMsgData($prestudent_id, &$variablesArray, &$msgVarsData) { $msgVarsData = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudent_id); @@ -111,7 +128,7 @@ class Messages extends VileSci_Controller { $variablesArray = array(); // Skip person_id and prestudent_id - for($i = 2; $i < count($variables->retval); $i++) + for ($i = 2; $i < count($variables->retval); $i++) { $variablesArray['{'.str_replace(" ", "_", strtolower($variables->retval[$i])).'}'] = $variables->retval[$i]; } @@ -121,6 +138,12 @@ class Messages extends VileSci_Controller array_shift($variables->retval); // Remove prestudent_id } + /** + * gets Message Variables and their data for Person + * @param $person_id + * @param $variablesArray to be filled with variable names + * @param $msgVarsData to be filled with variable data + */ private function getPersonMsgData($person_id, &$variablesArray, &$msgVarsData) { $msgVarsData = $this->MessageModel->getMsgVarsDataByPersonId($person_id); @@ -137,7 +160,7 @@ class Messages extends VileSci_Controller { $variablesArray = array(); // Skip person_id - for($i = 1; $i < count($variables->retval); $i++) + for ($i = 1; $i < count($variables->retval); $i++) { $variablesArray['{'.str_replace(" ", "_", strtolower($variables->retval[$i])).'}'] = $variables->retval[$i]; } @@ -148,8 +171,19 @@ class Messages extends VileSci_Controller /** * send */ - public function send($sender_id) + public function send($sender_id = null) { + if ($sender_id === null) + { + $user_person = $this->PersonModel->getByUid($this->uid); + + if (isError($user_person)) + { + show_error($user_person->retval); + } + $sender_id = $user_person->retval[0]->person_id; + } + $error = false; $subject = $this->input->post('subject'); @@ -165,7 +199,7 @@ class Messages extends VileSci_Controller // get message data of prestudents or persons $prestudentsData = array(); - if($prestudents !== null) + if ($prestudents !== null) { $data = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudents); // @@ -182,7 +216,7 @@ class Messages extends VileSci_Controller { $parsedText = ""; $dataArray = (array)$data->retval[$i]; - foreach($dataArray as $key => $val) + foreach ($dataArray as $key => $val) { $newKey = str_replace(" ", "_", strtolower($key)); $dataArray[$newKey] = $dataArray[$key]; @@ -191,7 +225,7 @@ class Messages extends VileSci_Controller $parsedText = $this->messagelib->parseMessageText($body, $dataArray); $oe_kurzbz = null; - if(hasData($prestudentsData)) + if (hasData($prestudentsData)) { for ($p = 0; $p < count($prestudentsData->retval); $p++) { @@ -247,7 +281,7 @@ class Messages extends VileSci_Controller { $person_id = $this->input->get('person_id'); } - else if ($this->input->post('person_id') !== null) + elseif ($this->input->post('person_id') !== null) { $person_id = $this->input->get('person_id'); } @@ -310,7 +344,7 @@ class Messages extends VileSci_Controller if (hasData($data)) { $dataArray = (array)$data->retval[0]; - foreach($dataArray as $key => $val) + foreach ($dataArray as $key => $val) { $newKey = str_replace(" ", "_", strtolower($key)); $dataArray[$newKey] = $dataArray[$key]; diff --git a/application/views/system/infocenter/infocenter.php b/application/views/system/infocenter/infocenter.php index 3b598203b..8244e8c67 100644 --- a/application/views/system/infocenter/infocenter.php +++ b/application/views/system/infocenter/infocenter.php @@ -8,7 +8,8 @@ 'fontawesome' => true, 'sbadmintemplate' => true, 'tablesorter' => true, - 'customCSSs' => 'skin/tablesort_bootstrap.css' + 'customCSSs' => 'skin/tablesort_bootstrap.css', + 'customJSs' => array('include/js/infocenterPersonDataset.js', 'include/js/bootstrapper.js') ) ); ?> @@ -40,11 +41,7 @@ diff --git a/application/views/system/infocenter/infocenterDetails.php b/application/views/system/infocenter/infocenterDetails.php index ed6bb2c7f..16effcfdd 100644 --- a/application/views/system/infocenter/infocenterDetails.php +++ b/application/views/system/infocenter/infocenterDetails.php @@ -10,7 +10,8 @@ $this->load->view( 'tablesorter' => true, 'tinymce' => true, 'sbadmintemplate' => true, - 'customCSSs' => array('skin/admintemplate.css', 'skin/tablesort_bootstrap.css') + 'customCSSs' => array('skin/admintemplate.css', 'skin/tablesort_bootstrap.css'), + 'customJSs' => 'include/js/bootstrapper.js' ) ); ?> @@ -127,10 +128,6 @@ $this->load->view( $(document).ready( function () { - //javascript bootstrap hack - not nice! - $("select").addClass('form-control'); - $("table").addClass('table-condensed'); - //initialise table sorter addTablesorter("doctable", [[2, 1], [1, 0]], ["zebra"]); addTablesorter("nachgdoctable", [[2, 0], [1, 1]], ["zebra"]); @@ -148,14 +145,6 @@ $this->load->view( "dateFormat": "dd.mm.yy" }); - //add submit event to message send link - $("#sendmsglink").click( - function() - { - $("#sendmsgform").submit(); - } - ); - //add click events to "formal geprüft" checkboxes diff --git a/application/views/system/infocenter/stammdaten.php b/application/views/system/infocenter/stammdaten.php index bd58879be..3e2ec1fb7 100644 --- a/application/views/system/infocenter/stammdaten.php +++ b/application/views/system/infocenter/stammdaten.php @@ -98,12 +98,18 @@ zugangscode)): ?>
-  Zugang - Bewerbung +  Zugang Bewerbung
- \ No newline at end of file + + \ No newline at end of file diff --git a/application/views/system/messageWrite.php b/application/views/system/messageWrite.php index 12f7d5aa6..340b9203e 100644 --- a/application/views/system/messageWrite.php +++ b/application/views/system/messageWrite.php @@ -16,7 +16,12 @@ $this->load->view( ">
- - +
+ +
-   +
+ +
 
+
-
-
+
- $val) { @@ -100,6 +108,7 @@ $href = str_replace("/system/Messages/write", "/system/Messages/send", $_SERVER[
+
- Preview: +
@@ -186,7 +195,8 @@ $href = str_replace("/system/Messages/write", "/system/Messages/send", $_SERVER[