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

Cleanup CI Header Template

Browse Source
This commit is contained in:
oesi
2017-03-17 16:18:46 +01:00
parent 7f4ba23f6c
commit eb46a7534b
3 changed files with 43 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/system/users.php
+16 -19
View File
@@ -1,7 +1,6 @@
<?php $this->load->view("templates/header", array("title" => "MessageReply", "jquery" => true, "tinymce" => true)); ?>
<body>
<div>
<form id="usersFiltersForm" action="" method="post">
<?php
@@ -18,7 +17,7 @@
?>
</form>
</div>
<form id="linkUsersForm" action="" method="post">
<div>
Stufe: <input type="text" name="stufe" value=""> <button type="button" id="linkToStufe">To step</button>
@@ -26,10 +25,10 @@
<div>
Gruppe: <input type="text" name="aufnahmegruppe" value=""> <button type="button" id="linkToGruppe">To group</button>
</div>
<br>
<br>
<div>
<?php
if ($users != null)
@@ -37,7 +36,7 @@
for ($i = 0; $i < count($users); $i++)
{
$user = $users[$i];
echo '<input type="checkbox" name="prestudent_id[]" value="' . $user->prestudent_id . '"> - ';
echo $user->prestudent_id . ' - ';
echo $user->vorname . ' - ';
@@ -52,16 +51,14 @@
?>
</div>
</form>
</body>
<?php
$hrefLinkToStufe = str_replace("/system/Users", "/system/Users/linkToStufe", $_SERVER["REQUEST_URI"]);
$hrefLinkToAufnahmegruppe = str_replace("/system/Users", "/system/Users/linkToAufnahmegruppe", $_SERVER["REQUEST_URI"]);
?>
<script>
$(document).ready(function() {
if ($("#linkToStufe"))
{
@@ -73,7 +70,7 @@
}
});
}
if ($("#linkToGruppe"))
{
$("#linkToGruppe").click(function() {
@@ -85,36 +82,36 @@
});
}
});
function studiengangSelected(value)
{
submitUsersFiltersForm();
}
function studiensemesterSelected(value)
{
submitUsersFiltersForm();
}
function reihungstestSelected(value)
{
submitUsersFiltersForm();
}
function gruppeSelected(value)
{
submitUsersFiltersForm();
}
function stufeSelected(value)
{
submitUsersFiltersForm();
}
function submitUsersFiltersForm()
{
document.getElementById("usersFiltersForm").submit();
}
</script>
</html>
</body>
<?php $this->load->view("templates/footer"); ?>
application/views/templates/header.php
+11 -19
View File
@@ -15,22 +15,19 @@ isset($title) ? $title = 'VileSci - '.$title : $title = 'VileSci';
if ($tablesort)
$jquery = true;
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!DOCTYPE HTML>
<html>
<head>
<title><?php echo $title; ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link rel="shortcut icon" href="<?php echo base_url('skin/images/Vilesci.ico'); ?>" type="image/x-icon">
<link rel="stylesheet" href="<?php echo base_url('skin/vilesci.css'); ?>" type="text/css" />
<meta charset="UTF-8">
<link rel="shortcut icon" type="image/x-icon" href="<?php echo base_url('skin/images/Vilesci.ico'); ?>" />
<link rel="stylesheet" type="text/css" href="<?php echo base_url('skin/vilesci.css'); ?>" />
<?php if($tablesort) : ?>
<link href="<?php echo base_url('skin/tablesort.css'); ?>" rel="stylesheet" type="text/css"/>
<link rel="stylesheet" type="text/css" href="<?php echo base_url('skin/tablesort.css'); ?>" />
<?php endif ?>
<?php if($jquery) : ?>
<script src="<?php echo base_url('include/js/jquery1.9.min.js'); ?>" type="text/javascript"></script>
<script type="text/javascript" src="<?php echo base_url('include/js/jquery1.9.min.js'); ?>"></script>
<?php endif ?>
<?php if($tablesort && !empty($tableid)) : ?>
<script language="Javascript" type="text/javascript">
$(document).ready(function()
@@ -44,23 +41,18 @@ if ($tablesort)
});
</script>
<?php endif ?>
<?php if($tinymce) : ?>
<script type="text/javascript" src="<?php echo base_url('vendor/tinymce/tinymce/tinymce.min.js');?>"></script>
<?php endif ?>
<?php if($textile) : ?>
<script type="text/javascript" src="<?php echo base_url('include/js/textile.min.js');?>"></script>
<?php endif ?>
<?php if($jsoneditor) : ?>
<link href="<?php echo base_url('vendor/jsoneditor/dist/jsoneditor.css');?>" rel="stylesheet" type="text/css">
<script src="<?php echo base_url('vendor/jsoneditor/dist/jsoneditor.js');?>"></script>
<link rel="stylesheet" type="text/css" href="<?php echo base_url('vendor/jsoneditor/dist/jsoneditor.css');?>" />
<script type="text/javascript" src="<?php echo base_url('vendor/jsoneditor/dist/jsoneditor.js');?>"></script>
<?php endif ?>
<?php if($jsonforms) : ?>
<link rel="stylesheet" href="<?php echo base_url('vendor/json-forms/dist/css/brutusin-json-forms.min.css'); ?>"/>
<script src="<?php echo base_url('vendor/json-forms/dist/js/brutusin-json-forms.min.js'); ?>"></script>
<link rel="stylesheet" type="text/css" href="<?php echo base_url('vendor/json-forms/dist/css/brutusin-json-forms.min.css'); ?>" />
<script type="text/javascript" src="<?php echo base_url('vendor/json-forms/dist/js/brutusin-json-forms.min.js'); ?>"></script>
<?php endif ?>
</head>
</head>
application/widgets/Usersfilters_widget.php
+16 -15
View File
@@ -8,25 +8,26 @@ class Usersfilters_widget extends Widget
private $gruppe;
private $reihungstest;
private $stufe;
public function __construct($name, $args)
{
// Calling daddy
parent::__construct($name, $args);
// Loads helper message to manage returning messages
$this->load->helper('message');
// Initialising properties
$this->_setProperties($args);
}
public function display($widgetData)
{
$errors = array(); // Array containing possible errors
// Studiengaenge
$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
$this->StudiengangModel->resetQuery();
$this->StudiengangModel->addOrder('kurzbzlang');
$studiengaenge = $this->StudiengangModel->loadWhere(array('aktiv' => true));
if (hasData($studiengaenge))
@@ -42,7 +43,7 @@ class Usersfilters_widget extends Widget
{
$errors[] = $studiengaenge; // Adding the error to the array of errors
}
// Studiensemester
$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
$this->StudiengangModel->addSelect('studiensemester_kurzbz, studiensemester_kurzbz AS beschreibung');
@@ -60,7 +61,7 @@ class Usersfilters_widget extends Widget
{
$errors[] = $studiensemester; // Adding the error to the array of errors
}
// Gruppen
$this->load->model('organisation/Gruppe_model', 'GruppeModel');
$this->GruppeModel->addOrder('beschreibung');
@@ -77,7 +78,7 @@ class Usersfilters_widget extends Widget
{
$errors[] = $gruppen; // Adding the error to the array of errors
}
// Stufe
$this->load->model('crm/Reihungstest_model', 'ReihungstestModel');
$this->ReihungstestModel->addSelect('DISTINCT ON(stufe) stufe, stufe AS beschreibung');
@@ -95,7 +96,7 @@ class Usersfilters_widget extends Widget
{
$errors[] = $stufen; // Adding the error to the array of errors
}
// Reihungstest
$reihungstest = success(array()); // default value empty array
// If the parameters studiengang or studiensemester are given and are not empty
@@ -105,7 +106,7 @@ class Usersfilters_widget extends Widget
$this->ReihungstestModel->resetQuery(); // cleans any previous setting
$this->ReihungstestModel->addSelect('reihungstest_id, concat(datum, \' \', uhrzeit, \' \', anmerkung) AS beschreibung');
$this->ReihungstestModel->addOrder('datum', 'DESC');
$parametersArray = array();
if ($this->studiengang != null)
{
@@ -115,14 +116,14 @@ class Usersfilters_widget extends Widget
{
$parametersArray['studiensemester_kurzbz'] = $this->studiensemester;
}
$reihungstest = $this->ReihungstestModel->loadWhere($parametersArray);
if (isError($reihungstest))
{
$errors[] = $reihungstest; // Adding the error to the array of errors
}
}
if (!isError($reihungstest))
{
// Adding an empty element at the beginning
@@ -131,7 +132,7 @@ class Usersfilters_widget extends Widget
$emptyElement->beschreibung = 'Select a reihungstest...';
array_unshift($reihungstest->retval, $emptyElement);
}
// Data to be used in the widget view
$viewData = array(
'studiengaenge' => $studiengaenge->retval,
@@ -146,11 +147,11 @@ class Usersfilters_widget extends Widget
'selectedReihungstest' => $this->reihungstest,
'selectedStufe' => $this->stufe
);
// Loads widget view
$this->view('widgets/usersfilters', $viewData);
}
/**
* Initialising properties
*/