diff --git a/application/controllers/Vilesci.php b/application/controllers/Vilesci.php
index fed0f077b..abfad4dd1 100644
--- a/application/controllers/Vilesci.php
+++ b/application/controllers/Vilesci.php
@@ -1,9 +1,16 @@
-load->library('WidgetLib');
+ }
+
/**
* Index Page for this controller.
*
@@ -22,8 +29,6 @@ class Vilesci extends FHC_Controller
*/
public function index()
{
- $this->load->view('templates/header');
- $this->load->view('vilesci_frameset');
- $this->load->view('templates/footer');
+ $this->load->view('home');
}
}
diff --git a/application/controllers/system/Messages.php b/application/controllers/system/Messages.php
index 73d405dcc..2fa2619f1 100644
--- a/application/controllers/system/Messages.php
+++ b/application/controllers/system/Messages.php
@@ -4,6 +4,8 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
class Messages extends VileSci_Controller
{
+ private $uid; // contains the UID of the logged user
+
/**
*
*/
@@ -17,7 +19,12 @@ class Messages extends VileSci_Controller
// Loads the widget library
$this->load->library('WidgetLib');
+ // Loads the person log library
+ $this->load->library('PersonLogLib');
+
$this->load->model('person/Person_model', 'PersonModel');
+
+ $this->_setAuthUID(); // sets property uid
}
/**
@@ -26,6 +33,8 @@ class Messages extends VileSci_Controller
public function write($sender_id, $msg_id = null, $receiver_id = null)
{
$prestudent_id = $this->input->post('prestudent_id');
+ $person_id = $this->input->post('person_id');
+
$msg = null;
// Get message data if possible
@@ -42,30 +51,15 @@ class Messages extends VileSci_Controller
}
}
+ $variablesArray = array();
+ $msgVarsData = array();
+
// Get variables
$this->load->model('system/Message_model', 'MessageModel');
- $msgVarsDataByPrestudentId = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudent_id);
- if ($msgVarsDataByPrestudentId->error)
- {
- show_error($msgVarsDataByPrestudentId->retval);
- }
-
- if (!hasData($variables = $this->MessageModel->getMessageVars()))
- {
- unset($variables);
- }
- else
- {
- $variablesArray = array();
- // Skip person_id and prestudent_id
- for($i = 2; $i < count($variables->retval); $i++)
- {
- $variablesArray['{'.str_replace(" ", "_", strtolower($variables->retval[$i])).'}'] = $variables->retval[$i];
- }
- }
-
- array_shift($variables->retval); // Remove person_id
- array_shift($variables->retval); // Remove prestudent_id
+ if($prestudent_id !== null)
+ $this->getPrestudentMsgData($prestudent_id, $variablesArray, $msgVarsData);
+ elseif($person_id !== null)
+ $this->getPersonMsgData($person_id, $variablesArray, $msgVarsData);
// Organisation units used to get the templates
$oe_kurzbz = array(); // A person can have more organisation units
@@ -89,7 +83,7 @@ class Messages extends VileSci_Controller
$data = array (
'sender_id' => $sender_id,
- 'receivers' => $msgVarsDataByPrestudentId->retval,
+ 'receivers' => isset($msgVarsData->retval) ? $msgVarsData->retval : $msgVarsData,
'message' => $msg,
'variables' => $variablesArray,
'oe_kurzbz' => $oe_kurzbz, // used to get the templates
@@ -99,6 +93,56 @@ class Messages extends VileSci_Controller
$v = $this->load->view('system/messageWrite', $data);
}
+ private function getPrestudentMsgData($prestudent_id, &$variablesArray, &$msgVarsData)
+ {
+ $msgVarsData = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudent_id);
+ if ($msgVarsData->error)
+ {
+ show_error($msgVarsData->retval);
+ }
+
+ if (!hasData($variables = $this->MessageModel->getMessageVars()))
+ {
+ unset($variables);
+ }
+ else
+ {
+ $variablesArray = array();
+ // Skip person_id and prestudent_id
+ for($i = 2; $i < count($variables->retval); $i++)
+ {
+ $variablesArray['{'.str_replace(" ", "_", strtolower($variables->retval[$i])).'}'] = $variables->retval[$i];
+ }
+ }
+
+ array_shift($variables->retval); // Remove person_id
+ array_shift($variables->retval); // Remove prestudent_id
+ }
+
+ private function getPersonMsgData($person_id, &$variablesArray, &$msgVarsData)
+ {
+ $msgVarsData = $this->MessageModel->getMsgVarsDataByPersonId($person_id);
+ if ($msgVarsData->error)
+ {
+ show_error($msgVarsData->retval);
+ }
+
+ if (!hasData($variables = $this->MessageModel->getMessageVarsPerson()))
+ {
+ unset($variables);
+ }
+ else
+ {
+ $variablesArray = array();
+ // Skip person_id
+ for($i = 1; $i < count($variables->retval); $i++)
+ {
+ $variablesArray['{'.str_replace(" ", "_", strtolower($variables->retval[$i])).'}'] = $variables->retval[$i];
+ }
+ array_shift($variables->retval); // Remove person_id
+ }
+ }
+
/**
* send
*/
@@ -109,6 +153,7 @@ class Messages extends VileSci_Controller
$subject = $this->input->post('subject');
$body = $this->input->post('body');
$prestudents = $this->input->post('prestudents');
+ $persons = $this->input->post('persons');
$relationmessage_id = $this->input->post('relationmessage_id');
if (!isset($relationmessage_id) || $relationmessage_id == '')
@@ -116,15 +161,20 @@ class Messages extends VileSci_Controller
$relationmessage_id = null;
}
- //
- $data = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudents);
+ // get message data of prestudents or persons
+ $prestudentsData = array();
+ if($prestudents !== null)
+ {
+ $data = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudents);
+ //
+ $this->load->model('crm/Prestudent_model', 'PrestudentModel');
+ $prestudentsData = $this->PrestudentModel->getOrganisationunits($prestudents);
+ }
+ else
+ $data = $this->MessageModel->getMsgVarsDataByPersonId($persons);
- //
- $this->load->model('crm/Prestudent_model', 'PrestudentModel');
- $prestudentsData = $this->PrestudentModel->getOrganisationunits($prestudents);
-
- //
- if (hasData($data) && hasData($prestudentsData))
+ // send message(s)
+ if (hasData($data))
{
for ($i = 0; $i < count($data->retval); $i++)
{
@@ -138,12 +188,15 @@ class Messages extends VileSci_Controller
$parsedText = $this->messagelib->parseMessageText($body, $dataArray);
- $oe_kurzbz = '';
- for ($p = 0; $p < count($prestudentsData->retval); $p++)
+ $oe_kurzbz = null;
+ if(hasData($prestudentsData))
{
- if ($prestudentsData->retval[$p]->prestudent_id == $data->retval[$i]->prestudent_id)
+ for ($p = 0; $p < count($prestudentsData->retval); $p++)
{
- $oe_kurzbz = $prestudentsData->retval[$p]->oe_kurzbz;
+ if ($prestudentsData->retval[$p]->prestudent_id == $data->retval[$i]->prestudent_id)
+ {
+ $oe_kurzbz = $prestudentsData->retval[$p]->oe_kurzbz;
+ }
}
}
@@ -154,6 +207,21 @@ class Messages extends VileSci_Controller
$error = true;
break;
}
+
+ //write log entry
+ $this->personloglib->log(
+ $dataArray['person_id'],
+ 'Action',
+ array(
+ 'name' => 'Message sent',
+ 'message' => 'Message sent from person '.$sender_id.' to '.$dataArray['person_id'].', messageid '.$msg->retval,
+ 'success' => 'true'
+ ),
+ 'kommunikation',
+ 'core',
+ null,
+ $this->uid
+ );
}
}
@@ -187,6 +255,16 @@ class Messages extends VileSci_Controller
return $person_id;
}
+ /**
+ * Retrieve the UID of the logged user and checks if it is valid
+ */
+ private function _setAuthUID()
+ {
+ $this->uid = getAuthUID();
+
+ if (!$this->uid) show_error('User authentification failed');
+ }
+
/**
* getVorlage
*/
diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php
index 54c697950..87f3421a0 100644
--- a/application/controllers/system/infocenter/InfoCenter.php
+++ b/application/controllers/system/infocenter/InfoCenter.php
@@ -3,13 +3,13 @@
if (! defined('BASEPATH')) exit('No direct script access allowed');
/**
- * Also shows aufnahme-related data for a person and its prestudents, enables document and zgv checks,
- * displays and saves Notizen for a person, logs aufnahme-related actions for a person
+ * Also shows infocenter-related data for a person and its prestudents, enables document and zgv checks,
+ * displays and saves Notizen for a person, logs infocenter-related actions for a person
*/
class InfoCenter extends VileSci_Controller
{
// App and Verarbeitungstaetigkeit name for logging
- const APP = 'aufnahme';
+ const APP = 'infocenter';
const TAETIGKEIT = 'bewerbung';
// URL prefix for this controller
@@ -19,8 +19,8 @@ class InfoCenter extends VileSci_Controller
private $logparams = array(
'saveformalgep' => array(
'logtype' => 'Action',
- 'name' => 'document formally checked',
- 'message' => 'document %s formally checked, set to %s'
+ 'name' => 'Document formally checked',
+ 'message' => 'Document %s formally checked, set to %s'
),
'savezgv' => array(
'logtype' => 'Action',
@@ -35,12 +35,12 @@ class InfoCenter extends VileSci_Controller
'freigegeben' => array(
'logtype' => 'Processstate',
'name' => 'Interessent confirmed',
- 'message' => 'status Interessent for prestudentid %s was confirmed for degree program %s'
+ 'message' => 'Status Interessent for prestudentid %s was confirmed for degree program %s'
),
'savenotiz' => array(
'logtype' => 'Action',
- 'name' => 'note added',
- 'message' => 'note with title %s was added'
+ 'name' => 'Note added',
+ 'message' => 'Note with title %s was added'
)
);
private $uid; // contains the UID of the logged user
@@ -70,6 +70,10 @@ class InfoCenter extends VileSci_Controller
$this->_setAuthUID(); // sets property uid
+ $this->load->library('PermissionLib');
+ if(!$this->permissionlib->isBerechtigt('basis/person'))
+ show_error('You have no Permission! You need Infocenter Role');
+
$this->_setNavigationMenuArray(); // sets property navigationMenuArray
$this->navigationHeaderArray = array(
@@ -228,40 +232,43 @@ class InfoCenter extends VileSci_Controller
show_error($lastStatus->retval);
}
- $result = $this->PrestudentstatusModel->insert(
- array(
- 'prestudent_id' => $prestudent_id,
- 'studiensemester_kurzbz' => $lastStatus->retval[0]->studiensemester_kurzbz,
- 'ausbildungssemester' => $lastStatus->retval[0]->ausbildungssemester,
- 'datum' => date('Y-m-d'),
- 'orgform_kurzbz' => $lastStatus->retval[0]->orgform_kurzbz,
- 'studienplan_id' => $lastStatus->retval[0]->studienplan_id,
- 'status_kurzbz' => 'Abgewiesener',
- 'statusgrund_id' => $statusgrund,
- 'insertvon' => $this->uid,
- 'insertamum' => date('Y-m-d H:i:s')
- )
- );
-
- if (isError($result))
+ //check if still Interessent and not freigegeben yet
+ if($lastStatus->retval[0]->status_kurzbz === 'Interessent' && !isset($lastStatus->retval[0]->bestaetigtam))
{
- show_error($result->retval);
+ $result = $this->PrestudentstatusModel->insert(
+ array(
+ 'prestudent_id' => $prestudent_id,
+ 'studiensemester_kurzbz' => $lastStatus->retval[0]->studiensemester_kurzbz,
+ 'ausbildungssemester' => $lastStatus->retval[0]->ausbildungssemester,
+ 'datum' => date('Y-m-d'),
+ 'orgform_kurzbz' => $lastStatus->retval[0]->orgform_kurzbz,
+ 'studienplan_id' => $lastStatus->retval[0]->studienplan_id,
+ 'status_kurzbz' => 'Abgewiesener',
+ 'statusgrund_id' => $statusgrund,
+ 'insertvon' => $this->uid,
+ 'insertamum' => date('Y-m-d H:i:s')
+ )
+ );
+
+ if (isError($result))
+ {
+ show_error($result->retval);
+ }
+
+ $logdata = $this->_getPersonAndStudiengangFromPrestudent($prestudent_id);
+
+ //statusgrund bezeichnung for logging
+ $this->StatusgrundModel->addSelect('bezeichnung_mehrsprachig');
+ $result = $this->StatusgrundModel->load($statusgrund);
+ if (isError($result))
+ {
+ show_error($result->retval);
+ }
+
+ $statusgrund_bez = $result->retval[0]->bezeichnung_mehrsprachig[1];
+
+ $this->_log($logdata['person_id'], 'abgewiesen', array($prestudent_id, $logdata['studiengang_kurzbz'], $statusgrund_bez));
}
-
- $logdata = $this->_getPersonAndStudiengangFromPrestudent($prestudent_id);
-
- //statusgrund bezeichnung for logging
- $this->StatusgrundModel->addSelect('bezeichnung_mehrsprachig');
- $result = $this->StatusgrundModel->load($statusgrund);
- if (isError($result))
- {
- show_error($result->retval);
- }
-
- $statusgrund_bez = $result->retval[0]->bezeichnung_mehrsprachig[1];
-
- $this->_log($logdata['person_id'], 'abgewiesen', array($prestudent_id, $logdata['studiengang_kurzbz'], $statusgrund_bez));
-
$this->_redirectToStart($prestudent_id, 'ZgvPruef');
}
@@ -278,31 +285,35 @@ class InfoCenter extends VileSci_Controller
{
$lastStatus = $lastStatus->retval[0];
- $result = $this->PrestudentstatusModel->update(
- array(
- 'prestudent_id' => $prestudent_id,
- 'status_kurzbz' => $lastStatus->status_kurzbz,
- 'studiensemester_kurzbz' => $lastStatus->studiensemester_kurzbz,
- 'ausbildungssemester' => $lastStatus->ausbildungssemester
- ),
- array(
- 'bestaetigtvon' => $this->uid,
- 'bestaetigtam' => date('Y-m-d'),
- 'updatevon' => $this->uid,
- 'updateamum' => date('Y-m-d H:i:s')
- )
- );
-
- if (isError($result))
+ //check if still Interessent and not freigegeben yet
+ if($lastStatus->status_kurzbz === 'Interessent' && !isset($lastStatus->bestaetigtam))
{
- show_error($result->retval);
+ $result = $this->PrestudentstatusModel->update(
+ array(
+ 'prestudent_id' => $prestudent_id,
+ 'status_kurzbz' => $lastStatus->status_kurzbz,
+ 'studiensemester_kurzbz' => $lastStatus->studiensemester_kurzbz,
+ 'ausbildungssemester' => $lastStatus->ausbildungssemester
+ ),
+ array(
+ 'bestaetigtvon' => $this->uid,
+ 'bestaetigtam' => date('Y-m-d'),
+ 'updatevon' => $this->uid,
+ 'updateamum' => date('Y-m-d H:i:s')
+ )
+ );
+
+ if (isError($result))
+ {
+ show_error($result->retval);
+ }
+
+ $logdata = $this->_getPersonAndStudiengangFromPrestudent($prestudent_id);
+
+ $this->_log($logdata['person_id'], 'freigegeben', array($prestudent_id, $logdata['studiengang_kurzbz']));
}
}
- $logdata = $this->_getPersonAndStudiengangFromPrestudent($prestudent_id);
-
- $this->_log($logdata['person_id'], 'freigegeben', array($prestudent_id, $logdata['studiengang_kurzbz']));
-
$this->_redirectToStart($prestudent_id, 'ZgvPruef');
}
@@ -374,7 +385,7 @@ class InfoCenter extends VileSci_Controller
*/
private function _setNavigationMenuArray()
{
- $filtersSent = $this->FiltersModel->getFilterList('aufnahme', 'PersonActions', '%InfoCenterSentApplication%');
+ $filtersSent = $this->FiltersModel->getFilterList('infocenter', 'PersonActions', '%InfoCenterSentApplication%');
if (hasData($filtersSent))
{
for ($filtersCounter = 0; $filtersCounter < count($filtersSent->retval); $filtersCounter++)
@@ -385,7 +396,7 @@ class InfoCenter extends VileSci_Controller
}
}
- $filtersNotSent = $this->FiltersModel->getFilterList('aufnahme', 'PersonActions', '%InfoCenterNotSentApplication%');
+ $filtersNotSent = $this->FiltersModel->getFilterList('infocenter', 'PersonActions', '%InfoCenterNotSentApplication%');
if (hasData($filtersNotSent))
{
for ($filtersCounter = 0; $filtersCounter < count($filtersNotSent->retval); $filtersCounter++)
@@ -449,7 +460,7 @@ class InfoCenter extends VileSci_Controller
*/
private function _loadPersonData($person_id)
{
- $stammdaten = $this->PersonModel->getPersonStammdaten($person_id);
+ $stammdaten = $this->PersonModel->getPersonStammdaten($person_id, true);
if (isError($stammdaten))
{
@@ -470,7 +481,7 @@ class InfoCenter extends VileSci_Controller
if (isError($dokumente_nachgereicht))
{
- show_error($dokumente->retval);
+ show_error($dokumente_nachgereicht->retval);
}
$logs = $this->personloglib->getLogs($person_id);
@@ -482,12 +493,22 @@ class InfoCenter extends VileSci_Controller
show_error($notizen->retval);
}
+ $user_person = $this->PersonModel->getByUid($this->uid);
+
+ if (isError($user_person))
+ {
+ show_error($user_person->retval);
+ }
+
+ $messagelink = base_url('/index.ci.php/system/Messages/write/'.$user_person->retval[0]->person_id);
+
$data = array (
'stammdaten' => $stammdaten->retval,
'dokumente' => $dokumente->retval,
'dokumente_nachgereicht' => $dokumente_nachgereicht->retval,
'logs' => $logs,
- 'notizen' => $notizen->retval
+ 'notizen' => $notizen->retval,
+ 'messagelink' => $messagelink
);
return $data;
diff --git a/application/libraries/MessageLib.php b/application/libraries/MessageLib.php
index eea05cef6..ee5f77230 100644
--- a/application/libraries/MessageLib.php
+++ b/application/libraries/MessageLib.php
@@ -45,7 +45,7 @@ class MessageLib
}
/**
- * getMessage() - returns the spicified received message for a specified person
+ * getMessage() - returns the specified received message for a specified person
*/
public function getMessage($msg_id, $person_id)
{
diff --git a/application/models/person/Benutzer_model.php b/application/models/person/Benutzer_model.php
index 339c7ea11..221688c21 100644
--- a/application/models/person/Benutzer_model.php
+++ b/application/models/person/Benutzer_model.php
@@ -11,4 +11,11 @@ class Benutzer_model extends DB_Model
$this->dbTable = 'public.tbl_benutzer';
$this->pk = 'uid';
}
+
+ public function getFromPersonId($person_id)
+ {
+ /*$this->addSelect('uid, aktiv, alias');*/
+ $this->loadWhere(array('person_id' => $person_id));
+ }
+
}
diff --git a/application/models/person/Person_model.php b/application/models/person/Person_model.php
index caf746b94..9c6f14f89 100644
--- a/application/models/person/Person_model.php
+++ b/application/models/person/Person_model.php
@@ -157,13 +157,14 @@ class Person_model extends DB_Model
* gets Stammdaten for a person, including contactdata in textform from other tables
* nation, kontakt, adresse
* @param $person_id
- * @return array
+ * @param bool $zustellung_only, when true, retrieve only Zustellkontakte
+ * @return array, null when no person found
*/
- public function getPersonStammdaten($person_id)
+ public function getPersonStammdaten($person_id, $zustellung_only = false)
{
- $this->addSelect('tbl_person.*, s.kurztext as staatsbuergerschaft, g.kurztext as geburtsnation');
- $this->addJoin('bis.tbl_nation s', 'tbl_person.staatsbuergerschaft = s.nation_code', 'LEFT');
- $this->addJoin('bis.tbl_nation g', 'tbl_person.geburtsnation = g.nation_code', 'LEFT');
+ $this->addSelect('public.tbl_person.*, s.kurztext as staatsbuergerschaft, g.kurztext as geburtsnation');
+ $this->addJoin('bis.tbl_nation s', 'public.tbl_person.staatsbuergerschaft = s.nation_code', 'LEFT');
+ $this->addJoin('bis.tbl_nation g', 'public.tbl_person.geburtsnation = g.nation_code', 'LEFT');
$person = $this->load($person_id);
@@ -180,11 +181,12 @@ class Person_model extends DB_Model
$this->KontaktModel->addDistinct();
$this->KontaktModel->addSelect('kontakttyp, anmerkung, kontakt, zustellung');
$this->KontaktModel->addOrder('kontakttyp');
- $kontakte = $this->KontaktModel->loadWhere(array('person_id' => $person_id));
+ $where = $zustellung_only === true ? array('person_id' => $person_id, 'zustellung' => true) : array('person_id' => $person_id);
+ $kontakte = $this->KontaktModel->loadWhere($where);
if($kontakte->error)
return error($kontakte->retval);
-
- $adressen = $this->AdresseModel->loadWhere(array('person_id' => $person_id));
+ $where = $zustellung_only === true ? array('person_id' => $person_id, 'zustelladresse' => true) : array('person_id' => $person_id);
+ $adressen = $this->AdresseModel->loadWhere($where);
if($adressen->error)
return error($adressen->retval);
@@ -194,4 +196,18 @@ class Person_model extends DB_Model
return success($stammdaten);
}
+
+ /**
+ * gets person data from uid
+ * @param $uid
+ * @return array
+ */
+ public function getByUid($uid)
+ {
+ $this->addSelect('vorname, nachname, gebdatum, person_id');
+ $this->addJoin('tbl_benutzer', 'person_id');
+
+ return $this->loadWhere(array('uid' => $uid));
+ }
+
}
diff --git a/application/models/system/Message_model.php b/application/models/system/Message_model.php
index a99716022..64d9ff5d1 100644
--- a/application/models/system/Message_model.php
+++ b/application/models/system/Message_model.php
@@ -102,6 +102,23 @@ class Message_model extends DB_Model
}
}
+ /**
+ * getMessageVars for person
+ */
+ public function getMessageVarsPerson()
+ {
+ $result = $this->db->query('SELECT * FROM public.vw_msg_vars_person WHERE 0 = 1');
+
+ if ($result)
+ {
+ return success($result->list_fields());
+ }
+ else
+ {
+ return error($this->db->error(), FHC_DB_ERROR);
+ }
+ }
+
/**
* getMsgVarsDataByPrestudentId
*/
@@ -111,4 +128,14 @@ class Message_model extends DB_Model
return $this->execQuery(sprintf($query, is_array($prestudent_id) ? 'IN' : '='), array($prestudent_id));
}
+
+ /**
+ * getMsgVarsDataByPersonId
+ */
+ public function getMsgVarsDataByPersonId($person_id)
+ {
+ $query = 'SELECT * FROM public.vw_msg_vars_person WHERE person_id %s ?';
+
+ return $this->execQuery(sprintf($query, is_array($person_id) ? 'IN' : '='), array($person_id));
+ }
}
diff --git a/application/views/home.php b/application/views/home.php
new file mode 100644
index 000000000..5e7deddb0
--- /dev/null
+++ b/application/views/home.php
@@ -0,0 +1,158 @@
+load->view('templates/FHC-Header',
+ array(
+ 'title' => 'FH-Complete',
+ 'jquery' => true,
+ 'bootstrap' => true,
+ 'fontawesome' => true,
+ 'sbadmintemplate' => true
+ )
+);
+?>
+
+
+ 'FH-Complete', 'headertextlink' => base_url('index.ci.php/'));
+ $navigationMenuArray = array(
+ 'Dashboard' => array('link' => '#', 'description' => 'Dashboard', 'icon' => 'dashboard'),
+ 'Lehre' => array('link' => '#', 'icon' => 'graduation-cap', 'description' => 'Lehre', 'expand' => true,
+ 'children'=> array(
+ 'CIS' => array('link' => CIS_ROOT, 'icon' => '', 'description' => 'CIS', 'expand' => true),
+ 'Infocenter' => array('link' => base_url('index.ci.php/system/infocenter/InfoCenter'), 'icon' => 'info', 'description' => 'Infocenter', 'expand' => true),
+ )
+ ),
+ 'Administration' => array('link' => '#', 'icon' => 'gear', 'description' => 'Administration', 'expand' => false,
+ 'children'=> array(
+ 'Vilesci' => array('link' => base_url('vilesci/'), 'icon' => '', 'description' => 'Vilesci', 'expand' => true),
+ 'Extensions' => array('link' => base_url('index.ci.php/system/extensions/Manager'), 'icon' => 'cubes', 'description' => 'Extensions Manager', 'expand' => true),
+ 'Datenschutz' => array('link' => base_url('index.ci.php/extensions/FHC-Core-DSMS/export'), 'description' => 'Datenschutz', 'icon' => 'legal','expand' => true)
+ )
+ ),
+ );
+
+ echo $this->widgetlib->widget(
+ 'NavigationWidget',
+ array(
+ 'navigationHeader' => $navigationHeaderArray,
+ 'navigationMenu' => $navigationMenuArray
+ )
+ );
+
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
12
+
neue Interessenten
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
124
+
inaktive Interessenten
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
13
+
Support Tickets!
+
+
+
+
+
+
+
+
+
+
+
+
+ load->view('system/infocenter/infocenterData.php');
+ ?>
+
+
+
+
+
+
+load->view('templates/FHC-Footer'); ?>
diff --git a/application/views/system/infocenter/infocenter.php b/application/views/system/infocenter/infocenter.php
index 87bee5b84..3b598203b 100644
--- a/application/views/system/infocenter/infocenter.php
+++ b/application/views/system/infocenter/infocenter.php
@@ -44,7 +44,7 @@
$("select").addClass("form-control");
$("input[type=text]").addClass("form-control");
$("input[type=button]").addClass("btn btn-default");
- $("#tableDataset").addClass('table table-bordered table-striped table-responsive table-condensed');
+ $("#tableDataset").addClass('table table-bordered table-responsive table-condensed');
widgetlib->widget(
- 'NavigationWidget',
- array(
- 'navigationHeader' => $navigationHeaderArray,
- 'navigationMenu' => $navigationMenuArray
- )
- );
+ echo $this->widgetlib->widget(
+ 'NavigationWidget',
+ array(
+ 'navigationHeader' => $navigationHeaderArray,
+ 'navigationMenu' => $navigationMenuArray
+ )
+ );
?>
+ Details: vorname.' '.$stammdaten->nachname ?>
+
-
+
Stammdaten
@@ -90,7 +91,6 @@
| Typ |
Kontakt |
- Zustellung |
Anmerkung |
@@ -110,7 +110,6 @@
- zustellung === true ? '' : ''; ?> |
anmerkung; ?> |
@@ -122,18 +121,35 @@
strasse.', '.$adresse->plz.' '.$adresse->ort : '' ?>
|
-
- zustelladresse === true ? '' : '' ?>
- |
heimatadresse === true ? 'Heimatadresse' : '').($adresse->heimatadresse === true && $adresse->rechnungsadresse === true ? ', ' : '').($adresse->rechnungsadresse === true ? 'Rechnungsadresse' : ''); ?>
|
-
+
-
-
+
+
+ zugangscode)): ?>
+
+
+
+
+
@@ -142,12 +158,12 @@
-
+
Dokumentenprüfung
-
+
| Name |
Typ |
@@ -180,7 +196,7 @@
0): ?>
Nachzureichende Dokumente:
-
+
| Typ |
Nachzureichen am |
@@ -215,7 +231,7 @@
-
+
ZGV-Prüfung
@@ -225,19 +241,26 @@
infoonly;
- $firstcolumns = array(3, 2, 2, 2, 3);
//set bootstrap columns
- if ($infoonly)
- $columns = array(3, 2, 2, 5);
- else
- $columns = array(4, 3, 2, 3);
+ $columns = array(4, 3, 2, 3);
?>
+
-
+
+
+ prestudentstatus->status_kurzbz) && $zgvpruefung->prestudentstatus->status_kurzbz === 'Interessent' && !$infoonly): ?>
+
+ prestudentstatus->bewerbung_abgeschicktamum) ? '' : ''); ?>
+
+
+
+
+
+
+
+
-
+
Notizen & Aktivitäten
@@ -575,7 +614,9 @@
rows="10"
cols="32">
-
+
+
+
-
@@ -640,17 +663,17 @@
-
-
-
+
+
+
diff --git a/application/views/system/messageWrite.php b/application/views/system/messageWrite.php
index 940e097ad..6b300bc46 100644
--- a/application/views/system/messageWrite.php
+++ b/application/views/system/messageWrite.php
@@ -126,8 +126,9 @@
prestudent_id) ? $receiver->prestudent_id : $receiver->person_id;
?>
-
+
@@ -156,7 +157,17 @@
for($i = 0; $i < count($receivers); $i++)
{
$receiver = $receivers[$i];
- echo '' . "\n";
+ if (isset($receiver->prestudent_id))
+ {
+ $receiverid = $receiver->prestudent_id;
+ $fieldname= 'prestudents[]';
+ }
+ else
+ {
+ $receiverid = $receiver->person_id;
+ $fieldname= 'persons[]';
+ }
+ echo '' . "\n";
}
?>
diff --git a/application/views/templates/FHC-Header.php b/application/views/templates/FHC-Header.php
index 098d2a795..fe29215e0 100644
--- a/application/views/templates/FHC-Header.php
+++ b/application/views/templates/FHC-Header.php
@@ -97,8 +97,8 @@ function _generateJSsInclude($JSs)
// Table sorter CSS
if ($tablesorter === true)
{
- _generateCSSsInclude('vendor/mottie/tablesorter/css/theme.default.css');
- _generateCSSsInclude('vendor/mottie/tablesorter/addons/pager/jquery.tablesorter.pager.css');
+ _generateCSSsInclude('vendor/mottie/tablesorter/dist/css/theme.default.min.css');
+ _generateCSSsInclude('vendor/mottie/tablesorter/dist/css/jquery.tablesorter.pager.min.css');
}
// sb admin template CSS
if ($sbadmintemplate === true)
@@ -127,15 +127,15 @@ function _generateJSsInclude($JSs)
// Table sorter JS
if ($tablesorter === true)
{
- _generateJSsInclude('vendor/mottie/tablesorter/js/jquery.tablesorter.js');
- _generateJSsInclude('vendor/mottie/tablesorter/js/jquery.tablesorter.widgets.js');
- _generateJSsInclude('vendor/mottie/tablesorter/addons/pager/jquery.tablesorter.pager.js');
+ _generateJSsInclude('vendor/mottie/tablesorter/dist/js/jquery.tablesorter.min.js');
+ _generateJSsInclude('vendor/mottie/tablesorter/dist/js/jquery.tablesorter.widgets.min.js');
+ _generateJSsInclude('vendor/mottie/tablesorter/dist/js/extras/jquery.tablesorter.pager.min.js');
}
// sb admin template JS
if ($sbadmintemplate === true)
{
_generateJSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/vendor/metisMenu/metisMenu.min.js');
- _generateJSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/dist/js/sb-admin-2.js');
+ _generateJSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/dist/js/sb-admin-2.min.js');
}
// Eventually required JS
diff --git a/application/views/vilesci_frameset.php b/application/views/vilesci_frameset.php
deleted file mode 100644
index cd193d90e..000000000
--- a/application/views/vilesci_frameset.php
+++ /dev/null
@@ -1,13 +0,0 @@
-
diff --git a/application/views/widgets/navigationMenu.php b/application/views/widgets/navigationMenu.php
index d957be2b6..c67f90a55 100644
--- a/application/views/widgets/navigationMenu.php
+++ b/application/views/widgets/navigationMenu.php
@@ -1,7 +1,46 @@
-
';
}
- else
- echo 'foo';
}
else if($method == 'ende')
{
diff --git a/content/fas.xul.php b/content/fas.xul.php
index fd1eb09e9..c20256059 100644
--- a/content/fas.xul.php
+++ b/content/fas.xul.php
@@ -147,6 +147,8 @@ foreach($addon_obj->result as $addon)
+
+
@@ -673,6 +675,18 @@ foreach($addon_obj->result as $addon)
+
+