blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-20 16:32:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge origin/ci into ci

Browse Source
This commit is contained in:
paolo
2016-06-23 10:34:54 +02:00
parent 226d1652ef 4f14e7fa92
commit 8df43d4b6f
21 changed files with 212 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/system/Messages.php
+35 -5
View File
@@ -8,8 +8,7 @@ class Messages extends VileSci_Controller
{
parent::__construct();
$this->load->library('MessageLib');
//$this->load->model('person/Person_model');
//$this->load->model('system/Message_model');
$this->load->model('person/Person_model', 'PersonModel');
}
public function index($person_id = null)
@@ -18,7 +17,7 @@ class Messages extends VileSci_Controller
$this->load->view('system/messages.php', $data);
}
public function table($person_id = null)
public function inbox($person_id = null)
{
if (empty($person_id))
$person_id = $this->input->post('person_id', TRUE);
@@ -31,12 +30,43 @@ class Messages extends VileSci_Controller
$data = array
(
'uid' => $this->getUID(),
'messages' => $msg->retval
);
//var_dump ($data);
$this->load->view('system/messagesList.php', $data);
if (!empty($person_id))
{
$person = $this->PersonModel->load($person_id);
$data['person'] = $person->retval[0];
}
// var_dump ($data);
$this->load->view('system/messagesInbox.php', $data);
}
public function outbox($person_id = null)
{
if (empty($person_id))
$person_id = $this->input->post('person_id', TRUE);
if (empty($person_id))
$msg = $this->messagelib->getMessagesByUID($this->getUID());
else
$msg = $this->messagelib->getMessagesByPerson($person_id);
if ($msg->error)
show_error($msg->retval);
$data = array
(
'uid' => $this->getUID(),
'messages' => $msg->retval
);
if (!empty($person_id))
{
$person = $this->PersonModel->load($person_id);
$data['person'] = $person->retval[0];
}
//var_dump ($data);
$this->load->view('system/messagesOutbox.php', $data);
}
public function view($msg_id)
{
$msg = $this->messagelib->getMessage($msg_id);
application/controllers/system/Phrases.php
+11 -23
View File
@@ -90,20 +90,21 @@ class Phrases extends FHC_Controller
public function newText()
{
$vorlage_kurzbz = $this->input->post('vorlage_kurzbz', TRUE);
$phrase_id = $this->input->post('phrase_id', TRUE);
$data = array
(
'vorlage_kurzbz' => $vorlage_kurzbz,
'studiengang_kz' => 0,
'version' => 1,
'oe_kurzbz' => 'etw'
'phrase_id' => $phrase_id,
'sprache' => 'German',
'text' => '',
'description' => '',
'orgeinheit_kurzbz' => 'etw'
);
$vorlagetext = $this->vorlagelib->insertVorlagetext($data);
if ($vorlagetext->error)
show_error($vorlagetext->retval);
$vorlagestudiengang_id = $vorlagetext->retval;
$phrase_inhalt = $this->phraseslib->insertPhraseinhalt($data);
if ($phrase_inhalt->error)
show_error($phrase_inhalt->retval);
$phrase_inhalt_id = $phrase_inhalt->retval;
redirect('/system/Templates/editText/'.$vorlagestudiengang_id);
redirect('/system/Phrases/editText/'.$phrase_inhalt_id);
}
public function editText($phrase_inhalt_id)
@@ -131,17 +132,4 @@ class Phrases extends FHC_Controller
//$this->load->view('system/templatetextEdit', $data);
}
public function preview($vorlagestudiengang_id)
{
$formdata = $this->input->post('formdata', FALSE);
$daten = json_decode($formdata, TRUE);
$vorlagetext = $this->vorlagelib->getVorlagetextById($vorlagestudiengang_id);
if ($vorlagetext->error)
show_error($vorlagetext->retval);
$data = array
(
'text' => $this->vorlagelib->parseVorlagetext($vorlagetext->retval[0]->text, $daten)
);
$this->load->view('system/templatetextPreview', $data);
}
}
application/controllers/system/Templates.php
+4
View File
@@ -134,6 +134,10 @@ class Templates extends FHC_Controller
$data['studiengang_kz'] = $this->input->post('studiengang_kz', TRUE);
$data['version'] = $this->input->post('version', TRUE);
$data['oe_kurzbz'] = $this->input->post('oe_kurzbz', TRUE);
if ($this->input->post('orgform_kurzbz') == '')
$data['orgform_kurzbz'] = null;
else
$data['orgform_kurzbz'] = $this->input->post('orgform_kurzbz', TRUE);
$data['text'] = $this->input->post('text', TRUE);
$data['aktiv'] = $this->input->post('aktiv', TRUE);
$vorlagetext = $this->vorlagelib->updateVorlagetext($vorlagestudiengang_id, $data);