mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-24 02:12:17 +00:00
Merge branch 'master' into udf
This commit is contained in:
Paolo
@@ -0,0 +1,47 @@
|
||||
<?php
|
||||
$this->load->view('templates/header', array('title' => 'StudienjahrList', 'tablesort' => true, 'tableid' => 't1', 'headers' => '2:{sorter:false}, 3:{sorter:false}', 'sortList' =>'0,1'));
|
||||
?>
|
||||
<body>
|
||||
<div class="row">
|
||||
<div class="span4">
|
||||
<h2>Studienjahr</h2>
|
||||
<a href="newStudienjahr/">
|
||||
Neues Studienjahr anlegen
|
||||
</a>
|
||||
<table id="t1" class="tablesorter">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Kurzbez</th>
|
||||
<th>Bezeichnung</th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach ($studienjahr as $jahr):
|
||||
$escapedstudienjahrkurzbz = str_replace("/", "_", $jahr->studienjahr_kurzbz);
|
||||
?>
|
||||
<tr>
|
||||
<td><?php echo $jahr->studienjahr_kurzbz; ?></td>
|
||||
<td><?php echo $jahr->bezeichnung; ?></td>
|
||||
<td>
|
||||
<a href="editStudienjahr/<?php echo $escapedstudienjahrkurzbz; ?>">
|
||||
Bearbeiten
|
||||
</a>
|
||||
</td>
|
||||
<td>
|
||||
<a href="deleteStudienjahr/<?php echo $escapedstudienjahrkurzbz; ?>">
|
||||
Löschen
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
<?php endforeach ?>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
<?php
|
||||
$jahr = $studienjahr[0];
|
||||
$this->load->view('templates/header', array('title' => 'StudienjahrEdit', 'jquery' => true));
|
||||
?>
|
||||
<body>
|
||||
<div class="row">
|
||||
<div class="row">
|
||||
<div class="span4">
|
||||
<h2>Studienjahr bearbeiten: <?php echo $jahr->bezeichnung; ?></h2>
|
||||
<form method="post" action="<?php echo APP_ROOT."index.ci.php/organisation/studienjahr/saveStudienjahr" ?>">
|
||||
|
||||
<table>
|
||||
<?php include('studienjahrForm.php'); ?>
|
||||
<input type="hidden" name="studienjahrkurzbz" value="<?php echo $jahr->studienjahr_kurzbz; ?>"/>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,49 @@
|
||||
<?php
|
||||
$bezeichnung = (isset($jahr->bezeichnung))?$jahr->bezeichnung:(isset($studienjahrkurzbz)?"Studienjahr ".$studienjahrkurzbz:"");
|
||||
?>
|
||||
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
Bezeichnung:<br/><br/>
|
||||
<input type="text" name="studienjahrbz" value="<?php echo $bezeichnung; ?>"/><br/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center">
|
||||
<button type="submit">Speichern</button>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="<?php echo '../listStudienjahr'; ?>">
|
||||
<button type="button">Zur Übersicht</button>
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" align="center">
|
||||
<a href="<?php echo '../../studiensemester/listStudiensemester'; ?>">
|
||||
<button type="button">Zur Semesterübersicht</button>
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
|
||||
</table>
|
||||
<br />
|
||||
<div class="input_ok"><?php if (isset($_GET['saved']) && $_GET['saved']) echo 'Studienjahr wurde gespeichert.'; ?></div>
|
||||
<div class="input_error" id="errormessage"></div>
|
||||
@@ -0,0 +1,40 @@
|
||||
<?php
|
||||
$this->load->view('templates/header', array('title' => 'StudienjahrNew', 'jqueryComposer' => true));
|
||||
?>
|
||||
<body>
|
||||
|
||||
<div class="row">
|
||||
<div class="row">
|
||||
<div class="span4">
|
||||
<h2>Neues Studienjahr anlegen</h2>
|
||||
<form method="post"
|
||||
action="<?php echo APP_ROOT."index.ci.php/organisation/studienjahr/insStudienjahr"; ?>" id="newStudienjahrForm">
|
||||
<table>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
Kurzbezeichnung:<br/><br/>
|
||||
<input type="text" name="studienjahrkurzbz" value="<?php echo $studienjahrkurzbz ?>"/><br/>
|
||||
</td>
|
||||
</tr>
|
||||
<?php include('studienjahrForm.php'); ?>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script>
|
||||
$('#newStudienjahrForm').submit(function (event) {
|
||||
var studienjahrkurzbez = $('input[name=studienjahrkurzbz]').val();
|
||||
if (checkStudienjahrkurzbez(studienjahrkurzbez))return;
|
||||
$('#errormessage').text("Studienjahrbezeichnung muss folgende Form haben: Jahreszahl/letzeZweiZahlenDesNächstenJahres, z.B. 2017/18");
|
||||
event.preventDefault();
|
||||
});
|
||||
|
||||
function checkStudienjahrkurzbez(semesterkurzbez) {
|
||||
var firstyear = parseInt(semesterkurzbez.substr(2,2));
|
||||
var secondyear = parseInt(semesterkurzbez.substr(5,2));
|
||||
var pattern = /^\d{4}\/\d{2}$/;
|
||||
return pattern.test(semesterkurzbez) && secondyear - firstyear === 1;
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,55 @@
|
||||
<?php
|
||||
$this->load->view('templates/header', array('title' => 'StudiensemesterList', 'tablesort' => true, 'tableid' => 't1', 'headers' => '7:{sorter:false}, 8:{sorter:false}', 'sortList' =>'4,1'));
|
||||
?>
|
||||
<body>
|
||||
<div class="row">
|
||||
<div class="span4">
|
||||
<h2>Studiensemester</h2>
|
||||
<a href="newStudiensemester/">
|
||||
Neues Studiensemester anlegen
|
||||
</a>
|
||||
<table id="t1" class="tablesorter">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Kurzbez</th>
|
||||
<th>Bezeichnung</th>
|
||||
<th>Start</th>
|
||||
<th>Ende</th>
|
||||
<th>Studienjahr</th>
|
||||
<th>Beschreibung</th>
|
||||
<th>Onlinebewerbung</th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach ($semester as $sem): ?>
|
||||
<tr>
|
||||
<td><?php echo $sem->studiensemester_kurzbz; ?></td>
|
||||
<td><?php echo $sem->bezeichnung; ?></td>
|
||||
<td><?php echo date_format(date_create($sem->start), "d.m.Y"); ?></td>
|
||||
<td><?php echo date_format(date_create($sem->ende), "d.m.Y"); ?></td>
|
||||
<td><?php echo $sem->studienjahr_kurzbz; ?></td>
|
||||
<td><?php echo $sem->beschreibung; ?></td>
|
||||
<td><?php echo ($sem->onlinebewerbung) ? "Ja" : "Nein"; ?></td>
|
||||
<td>
|
||||
<a href="editStudiensemester/<?php echo $sem->studiensemester_kurzbz; ?>">
|
||||
Bearbeiten
|
||||
</a>
|
||||
</td>
|
||||
<td>
|
||||
<a href="deleteStudiensemester/<?php echo $sem->studiensemester_kurzbz; ?>">
|
||||
Löschen
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
<?php endforeach ?>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
<?php
|
||||
$sem = $semester[0];
|
||||
$this->load->view('templates/header', array('title' => 'StudiensemesterEdit', 'datepicker' => true, 'datepickerclass' => 'dateinput'));
|
||||
?>
|
||||
<body>
|
||||
<div class="row">
|
||||
<div class="row">
|
||||
<div class="span4">
|
||||
<h2>Studiensemester bearbeiten: <?php echo $sem->studiensemester_kurzbz; ?></h2>
|
||||
<form method="post" action="<?php echo APP_ROOT."index.ci.php/organisation/studiensemester/saveStudiensemester" ?>">
|
||||
<table>
|
||||
<?php include('studiensemesterForm.php'); ?>
|
||||
<input type="hidden" name="semkurzbz" value="<?php echo $sem->studiensemester_kurzbz; ?>"/>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,103 @@
|
||||
<?php
|
||||
$bezeichnung = (isset($sem->bezeichnung) ? $sem->bezeichnung : "");
|
||||
$start = (isset($sem->start) ? date_format(date_create($sem->start), "d.m.Y") : "");
|
||||
$ende = (isset($sem->ende) ? date_format(date_create($sem->ende), "d.m.Y") : "");
|
||||
$studienjahr_kurzbz = (isset($sem->studienjahr_kurzbz) ? $sem->studienjahr_kurzbz : "");
|
||||
$beschreibung = (isset($sem->beschreibung) ? $sem->beschreibung : "");
|
||||
$onlinebewerbung = (isset($sem->onlinebewerbung) ? $sem->onlinebewerbung : "");
|
||||
?>
|
||||
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
Bezeichnung:<br/><br/>
|
||||
<input type="text" name="sembz" value="<?php echo $bezeichnung; ?>"/><br/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
Datum start:<br/><br/>
|
||||
<input type="text" class="dateinput" name="semstart" value="<?php echo $start; ?>"/><br/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
Datum ende:<br/><br/>
|
||||
<input type="text" class="dateinput" name="semende" value="<?php echo $ende; ?>"/><br/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
Studienjahr:<br/><br/>
|
||||
<select name="studienjahrkurzbz">
|
||||
<?php foreach ($allstudienjahre as $jahr): ?>
|
||||
<option <?php if ($studienjahr_kurzbz == $jahr->studienjahr_kurzbz) echo 'selected' ?>
|
||||
value="<?php echo $jahr->studienjahr_kurzbz ?>">
|
||||
<?php echo $jahr->bezeichnung ?>
|
||||
</option>
|
||||
<?php endforeach ?>
|
||||
</select>
|
||||
<a href="<?php echo '../../studienjahr/newStudienjahr/'; ?>">
|
||||
<button type="button">Neues Studienjahr</button>
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
Beschreibung:<br/><br/>
|
||||
<textarea name="beschreibung" rows="5" cols="33"><?php echo $beschreibung; ?></textarea>
|
||||
<br/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
Onlinebewerbung
|
||||
<br/>
|
||||
</td>
|
||||
<td>
|
||||
<input type="checkbox" name="onlinebewerbung" <?php if ($onlinebewerbung) echo 'checked' ?>/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center">
|
||||
<button type="submit">Speichern</button>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="<?php echo '../listStudiensemester'; ?>">
|
||||
<button type="button">Zur Übersicht</button>
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<br/>
|
||||
<div class="input_ok"><?php if (isset($_GET['saved']) && $_GET['saved']) echo 'Studiensemester wurde gespeichert.'; ?></div>
|
||||
<div class="input_error" id="errormessage"></div>
|
||||
@@ -0,0 +1,79 @@
|
||||
<?php
|
||||
$this->load->view('templates/header', array('title' => 'StudiensemesterNew', 'jqueryComposer' => true, 'datepicker' => true, 'datepickerclass' => 'dateinput'));
|
||||
?>
|
||||
<body>
|
||||
|
||||
<div class="row">
|
||||
<div class="row">
|
||||
<div class="span4">
|
||||
<h2>Neues Studiensemester anlegen</h2>
|
||||
<form method="post"
|
||||
action="<?php echo APP_ROOT."index.ci.php/organisation/studiensemester/insStudiensemester"; ?>"
|
||||
id="newSemesterForm">
|
||||
<table>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
Kurzbezeichnung:<br/><br/>
|
||||
<input type="text" name="semkurzbz" value=""/><br/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
<?php include('studiensemesterForm.php'); ?>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script>
|
||||
$(document).ready(function () {
|
||||
$('input[name=semkurzbz]').on(
|
||||
'input',
|
||||
function () {
|
||||
var semesterkurzbez = $('input[name=semkurzbz]').val();
|
||||
prefillYearFields(semesterkurzbez);
|
||||
}
|
||||
);
|
||||
});
|
||||
|
||||
function prefillYearFields(semesterkurzbez) {
|
||||
if (!checkSemesterkurzbez(semesterkurzbez))return;
|
||||
var semester = semesterkurzbez.substr(0, 2);
|
||||
var jahr = semesterkurzbez.substr(2, 6);
|
||||
var wsssbezeichnung, jahrbez, studienjahr, start, ende = "";
|
||||
if (semester == 'WS') {
|
||||
wsssbezeichnung = "Wintersemester";
|
||||
jahrbez = jahr + "/" + (parseInt(jahr) + 1);
|
||||
studienjahr = jahr + "/" + (parseInt(jahr.substr(2, 4)) + 1);
|
||||
start = "01.09." + jahr;
|
||||
ende = "01.02." + (parseInt(jahr) + 1);
|
||||
} else {
|
||||
wsssbezeichnung = "Sommersemester";
|
||||
jahrbez = jahr;
|
||||
studienjahr = jahr + "/" + (parseInt(jahr.substr(2, 4)) - 1);
|
||||
start = "01.02." + jahr;
|
||||
ende = "01.08." + jahr;
|
||||
}
|
||||
var bezeichnung = wsssbezeichnung + " " + jahrbez;
|
||||
$('input[name=sembz]').val(bezeichnung);
|
||||
$('input[name=semstart]').val(start);
|
||||
$('input[name=semende]').val(ende);
|
||||
$('input[name=studienjahrkurzbz]').val(studienjahr);
|
||||
}
|
||||
|
||||
$('#newSemesterForm').submit(function (event) {
|
||||
var semesterkurzbez = $('input[name=semkurzbz]').val();
|
||||
if (checkSemesterkurzbez(semesterkurzbez))return;
|
||||
$('#errormessage').text("Semesterkurzbezeichnung muss mit WS oder SS beginnen und mit einer Jahreszahl enden, z.B. SS2017");
|
||||
event.preventDefault();
|
||||
});
|
||||
|
||||
function checkSemesterkurzbez(semesterkurzbez) {
|
||||
var pattern = /^(WS|SS)\d{4}$/;
|
||||
return pattern.test(semesterkurzbez);
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -3,6 +3,8 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
|
||||
|
||||
isset($title) ? $title = 'VileSci - '.$title : $title = 'VileSci';
|
||||
!isset($jquery) ? $jquery = false : $jquery = $jquery;
|
||||
!isset($jqueryComposer) ? $jqueryComposer = false : $jqueryComposer = $jqueryComposer;
|
||||
!isset($jqueryui) ? $jqueryui = false : $jqueryui = $jqueryui;
|
||||
!isset($jquery_checkboxes) ? $jquery_checkboxes = false : $jquery_checkboxes = $jquery_checkboxes;
|
||||
!isset($jquery_custom) ? $jquery_custom = false : $jquery_custom = $jquery_custom;
|
||||
!isset($tablesort) ? $tablesort = false : $tablesort = $tablesort;
|
||||
@@ -14,9 +16,20 @@ isset($title) ? $title = 'VileSci - '.$title : $title = 'VileSci';
|
||||
!isset($jsonforms) ? $jsonforms = false : $jsonforms = $jsonforms;
|
||||
!isset($textile) ? $textile = false : $textile = $textile;
|
||||
!isset($widgetsCSS) ? $widgetsCSS = false : $widgetsCSS = $widgetsCSS;
|
||||
!isset($datepicker) ? $datepicker = false : $datepicker = $datepicker;
|
||||
|
||||
if ($tablesort || $jquery_checkboxes || $jquery_custom)
|
||||
$jquery = true;
|
||||
|
||||
if($datepicker)
|
||||
$jqueryui = true;
|
||||
|
||||
if($jqueryui)
|
||||
$jqueryComposer = true;
|
||||
|
||||
if($jquery && $jqueryComposer)
|
||||
show_error("Two JQuery versions used: composer and includefolderversion");
|
||||
|
||||
?>
|
||||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
@@ -33,6 +46,15 @@ if ($tablesort || $jquery_checkboxes || $jquery_custom)
|
||||
<script type="text/javascript" src="<?php echo base_url('include/js/jquery1.9.min.js'); ?>"></script>
|
||||
<?php endif ?>
|
||||
|
||||
<?php if($jqueryComposer) : ?>
|
||||
<script type="text/javascript" src="<?php echo base_url('vendor/components/jquery/jquery.min.js'); ?>"></script>
|
||||
<?php endif ?>
|
||||
|
||||
<?php if($jqueryui) : ?>
|
||||
<script type="text/javascript" src="<?php echo base_url('vendor/components/jqueryui/jquery-ui.min.js'); ?>"></script>
|
||||
<link rel="stylesheet" type="text/css" href="<?php echo base_url('vendor/components/jqueryui/themes/base/jquery-ui.min.css'); ?>" />
|
||||
<?php endif ?>
|
||||
|
||||
<?php if($jquery_checkboxes) : ?>
|
||||
<script type="text/javascript" src="<?php echo base_url('include/js/jquery.checkboxes-1.0.7.min.js'); ?>"></script>
|
||||
<?php endif ?>
|
||||
@@ -54,6 +76,19 @@ if ($tablesort || $jquery_checkboxes || $jquery_custom)
|
||||
});
|
||||
</script>
|
||||
<?php endif ?>
|
||||
|
||||
<?php if($datepicker && !empty($datepickerclass)) : ?>
|
||||
<script language="Javascript" type="text/javascript">
|
||||
$(document).ready(function()
|
||||
{
|
||||
$(".<?php echo $datepickerclass; ?>").datepicker(
|
||||
{
|
||||
dateFormat:"dd.mm.yy"
|
||||
});
|
||||
});
|
||||
</script>
|
||||
<?php endif ?>
|
||||
|
||||
<?php if($tinymce) : ?>
|
||||
<script type="text/javascript" src="<?php echo base_url('vendor/tinymce/tinymce/tinymce.min.js');?>"></script>
|
||||
<?php endif ?>
|
||||
|
||||
Reference in New Issue
Block a user