diff --git a/application/controllers/system/Users.php b/application/controllers/system/Users.php index 05744edb7..aeef474ff 100644 --- a/application/controllers/system/Users.php +++ b/application/controllers/system/Users.php @@ -36,6 +36,41 @@ class Users extends VileSci_Controller $users = $returnUsers->retval; } + // Gruppen + $this->load->model('organisation/Gruppe_model', 'GruppeModel'); + $this->GruppeModel->addOrder('beschreibung'); + $gruppen = $this->GruppeModel->loadWhere(array('aktiv' => true, 'aufnahmegruppe' => true)); + if (hasData($gruppen)) + { + // Adding an empty element at the beginning + $emptyElement = new stdClass(); + $emptyElement->gruppe_kurzbz = '-1'; + $emptyElement->beschreibung = 'Select a group...'; + array_unshift($gruppen->retval, $emptyElement); + } + else + { + show_error($gruppen->retval); + } + + // Stufe + $this->load->model('crm/Reihungstest_model', 'ReihungstestModel'); + $this->ReihungstestModel->addSelect('DISTINCT ON(stufe) stufe, stufe AS beschreibung'); + $this->ReihungstestModel->addOrder('stufe'); + $stufen = $this->ReihungstestModel->loadWhere('stufe IS NOT NULL'); + if (hasData($stufen)) + { + // Adding an empty element at the beginning + $emptyElement = new stdClass(); + $emptyElement->stufe = '-1'; + $emptyElement->beschreibung = 'Select a stufe...'; + array_unshift($stufen->retval, $emptyElement); + } + else + { + show_error($stufen->retval); + } + if ($returnUsers == null || isSuccess($returnUsers)) { $viewData = array( @@ -44,7 +79,9 @@ class Users extends VileSci_Controller 'gruppe' => $gruppe, 'reihungstest' => $reihungstest, 'stufe' => $stufe, - 'users' => $users + 'users' => $users, + 'gruppen' => $gruppen->retval, + 'stufen' => $stufen->retval ); $this->load->view('system/users', $viewData); @@ -67,11 +104,12 @@ class Users extends VileSci_Controller if (isSuccess($result)) { - echo "Tutto ok!"; + $href = str_replace("/system/Users/linkToStufe", "/system/Users", $_SERVER["REQUEST_URI"]); + echo "
Data correctly saved - Back
"; } else { - echo "Kaputt!"; + echo "
Error occurred while saving data, please contact the administrator.
"; } } @@ -87,11 +125,12 @@ class Users extends VileSci_Controller if (isSuccess($result)) { - echo "Tutto ok!"; + $href = str_replace("/system/Users/linkToAufnahmegruppe", "/system/Users", $_SERVER["REQUEST_URI"]); + echo "
Data correctly saved - Back
"; } else { - echo "Kaputt!"; + echo "
Error occurred while saving data, please contact the administrator.
"; } } @@ -112,7 +151,9 @@ class Users extends VileSci_Controller sg.bezeichnung, sg.orgform_kurzbz, sgt.bezeichnung AS typ, + s.bezeichnung AS studienplan, ps.rt_stufe, + aufnahmegruppe_kurzbz, rtp.punkte' ); diff --git a/application/core/DB_Model.php b/application/core/DB_Model.php index db6e11408..f34d6fe1c 100644 --- a/application/core/DB_Model.php +++ b/application/core/DB_Model.php @@ -653,6 +653,7 @@ class DB_Model extends FHC_Model { if (($isEntitled = $this->isEntitled($this->dbTable, $permission, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) { + // TODO: resetQuery return $isEntitled; } } diff --git a/application/views/system/messageWrite.php b/application/views/system/messageWrite.php index d0a643d92..a987b00d7 100644 --- a/application/views/system/messageWrite.php +++ b/application/views/system/messageWrite.php @@ -5,81 +5,124 @@ $href = str_replace("/system/Messages/write", "/system/Messages/send", $_SERVER["REQUEST_URI"]); ?>
- -
-
- To: - 1 && $i % 10 == 0) - { - echo '
'; - } - echo $receiver->Vorname . " " . $receiver->Nachname . "; "; - } - ?> -
- Subject:
- - - Variables:
- + + + + + + + + + +
+ Message:
+ + 		  + - +
+ Variables:
+ +
- - - - - +
-
-
- -            - templatelib->widget("Vorlage_widget", array("title" => "Vorlage")); ?> -
-
+ + + + + + +
+ templatelib->widget("Vorlage_widget", array("title" => "Vorlage")); ?> + +   + + +
+ +
0) { ?> -
-
- Recipients:
- - Refresh -
+
+ Preview:
- -
-
- -
+
+ + + + + + + + + + +
+ Recipient: + +   + Refresh +
+   +
+ +
load->view("templates/header", array("title" => "MessageReply", "jquery" => true, "tinymce" => true)); ?> +load->view("templates/header", array("title" => "Users manager", "jquery" => true, "tablesort" => true, "jquery_checkboxes" => true, "jquery_custom" => true)); ?>
@@ -17,15 +17,70 @@ ?>
- + +
+
-
- Stufe: -
-
- Gruppe: -
- + + + + + + + + + + + + + + + + + +
+ Assign to: +
+ +   + +
+ +   + +
+

@@ -33,20 +88,100 @@ + + + + + + + + + + + + + + + + + + + + + prestudent_id . '"> - '; - echo $user->prestudent_id . ' - '; - echo $user->vorname . ' - '; + + echo ""; + + echo ""; + + echo ""; + + echo ""; + + echo ""; + + echo ""; + + echo ""; + + echo ""; + + echo ""; + + echo ""; + + echo ""; + + echo ""; + + echo ""; + + echo ""; + + echo ""; + + echo ""; } + ?> + +
 Prestudent IDPerson IDVornameNachnameGeschlechtStudiengangOrgFormStudienplanGeburtsdatumEmailStufeGruppePunkte
"; + echo ''; + echo ""; + echo $user->prestudent_id; + echo ""; + echo $user->person_id; + echo ""; + echo $user->vorname; + echo ""; echo $user->nachname; - echo '
'; + echo "		"; + echo $user->geschlecht; + echo ""; + echo $user->kurzbzlang; + echo ""; + echo $user->orgform_kurzbz; + echo ""; + echo $user->studienplan; + echo ""; + echo $user->gebdatum; + echo ""; + echo $user->email; + echo ""; + echo $user->rt_stufe; + echo ""; + echo $user->aufnahmegruppe_kurzbz; + echo ""; + echo $user->punkte; + echo "
+
@@ -81,6 +216,43 @@ } }); } + + $(".tablesorter").each(function(i, v) { + $("#"+v.id).tablesorter( + { + widgets: ["zebra"], + sortList: [[3,0],[4,0]], + headers: {0: { sorter: false}} + }); + + $("#toggle_"+v.id).on('click', function(e) { + $("#"+v.id).checkboxes('toggle'); + e.preventDefault(); + if ($("input.chkbox:checked").size() > 0) + $("#mailSendButton").html('Mail an markierte Personen senden'); + else + $("#mailSendButton").html('Mail an alle senden'); + }); + + $("#uncheck_"+v.id).on('click', function(e) { + $("#"+v.id).checkboxes('uncheck'); + e.preventDefault(); + if ($("input.chkbox:checked").size() > 0) + $("#mailSendButton").html('Mail an markierte Personen senden'); + else + $("#mailSendButton").html('Mail an alle senden'); + }); + + $("#"+v.id).checkboxes('range', true); + }); + + $('.chkbox').change(function() + { + if ($("input.chkbox:checked").size() > 0) + $("#mailSendButton").html('Mail an markierte Personen senden'); + else + $("#mailSendButton").html('Mail an alle senden'); + }); }); function studiengangSelected(value) diff --git a/application/views/templates/header.php b/application/views/templates/header.php index 8aa4ea8dd..97d280585 100644 --- a/application/views/templates/header.php +++ b/application/views/templates/header.php @@ -1,8 +1,10 @@ @@ -25,9 +27,19 @@ if ($tablesort) + + + + + + + + + +