blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-10 00:29:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

added bootstrap datepicker, dokumente nachgereicht in separate table, zgv panels collapsible and Interessenten come first, made columns more responsive

Browse Source
This commit is contained in:
alex
2018-01-10 09:53:34 +01:00
parent 978934d22a
commit 0e6e6ab8ea
6 changed files with 369 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/system/infocenter/InfocenterDetails.php
+31 -2
View File
@@ -23,8 +23,8 @@ class InfocenterDetails extends VileSci_Controller
$this->load->model('person/notiz_model', 'NotizModel');
$this->load->model('crm/prestudent_model', 'PrestudentModel');
$this->load->model('crm/prestudentstatus_model', 'PrestudentstatusModel');
$this->load->model('crm/akte_model', 'AkteModel');
$this->load->model('crm/statusgrund_model', 'StatusgrundModel');
$this->load->model('crm/akte_model', 'AkteModel');
$this->load->library('DmsLib');
$this->load->library('WidgetLib');
@@ -55,13 +55,31 @@ class InfocenterDetails extends VileSci_Controller
if(!isset($stammdaten->retval))
return null;
$dokumente = $this->AkteModel->loadWhere(array('person_id' => $person_id));
/* $dokumente = $this->AkteModel->loadWhere(array('person_id' => $person_id));
if ($dokumente->error)
{
show_error($dokumente->retval);
}
var_dump($dokumente->retval);*/
$dokumente = $this->AkteModel->getAktenWithDokInfo($person_id, null, false);
if ($dokumente->error)
{
show_error($dokumente->retval);
}
$dokumente_nachgereicht = $this->AkteModel->getAktenWithDokInfo($person_id, null, true);
if ($dokumente_nachgereicht->error)
{
show_error($dokumente->retval);
}
//var_dump($dokumente->retval);die();
$logs = $this->personloglib->getLogs($person_id, $this::APP);
$notizen = $this->NotizModel->getNotiz($person_id);
@@ -74,6 +92,7 @@ class InfocenterDetails extends VileSci_Controller
$data = array (
'stammdaten' => $stammdaten->retval,
'dokumente' => $dokumente->retval,
'dokumente_nachgereicht' => $dokumente_nachgereicht->retval,
'logs' => $logs,
'notizen' => $notizen->retval
);
@@ -109,6 +128,16 @@ class InfocenterDetails extends VileSci_Controller
$zgvpruefungen[] = $prestudent->retval[0];
}
//Interessenten come first
usort($zgvpruefungen, function ($a, $b){
if($a->prestudentstatus->status_kurzbz === 'Interessent')
return -1;
else if($b->prestudentstatus->status_kurzbz === 'Interessent')
return 1;
else
return 0;
});
//TODO replace with widget
$statusgruende = $this->StatusgrundModel->load()->retval;
application/models/crm/Akte_model.php
+32 -2
View File
@@ -70,7 +70,7 @@ class Akte_model extends DB_Model
return $this->execQuery($query, $parametersArray);
}
/**
* getAktenAccepted
*/
@@ -116,7 +116,7 @@ class Akte_model extends DB_Model
return $this->execQuery($query, $parametersArray);
}
/**
* getAktenAcceptedDms
*/
@@ -173,4 +173,34 @@ class Akte_model extends DB_Model
return $this->execQuery($query, $parametersArray);
}
/**
* gets Akten together with Documenttype info, mainly bezeichnung fields
* @param $person_id
* @param null $dokument_kurzbz
* @param bool $nachgereicht if true, retrieves only nachgereichte Dokumente. if false, only not nachgereichte. default: null, all Dokumente
* @return array
*/
public function getAktenWithDokInfo($person_id, $dokument_kurzbz = null, $nachgereicht = null)
{
if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent;
$this->addSelect('public.tbl_akte.*, bezeichnung_mehrsprachig, dokumentbeschreibung_mehrsprachig, public.tbl_dokument.bezeichnung as dokument_bezeichnung', 'ausstellungsdetails');
$this->addJoin('public.tbl_dokument', 'dokument_kurzbz');
$where = array();
$where['person_id'] = $person_id;
if(isset($dokument_kurzbz))
$where['dokument_kurzbz'] = $dokument_kurzbz;
if(is_bool($nachgereicht))
$where['nachgereicht'] = $nachgereicht;
$dokumente = $this->loadWhere($where);
if($dokumente->error)
return error($dokumente->retval);
return success($dokumente->retval);
}
}
application/views/system/infocenter/infocenterDetails.php
+239 -201
View File
@@ -1,113 +1,110 @@
<?php
$this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails', 'jquery3' => true, 'jqueryui' => true, 'bootstrap' => true, 'fontawesome' => true, 'datatables' => true, 'customCSSs' => 'vendor/BlackrockDigital/startbootstrap-sb-admin-2/dist/css/sb-admin-2.min.css'/*, 'datepickerclass' => 'dateinput'*/));
$this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails', 'jquery3' => true, 'bootstrap' => true, 'fontawesome' => true, 'bootstrapdatepicker' => true, 'datatables' => true, 'customCSSs' => 'vendor/BlackrockDigital/startbootstrap-sb-admin-2/dist/css/sb-admin-2.min.css'));
?>
<body>
<div id="page-wrapper">
<div class="row">
<div class="col-md-12">
<div class="col-lg-12">
<h3 class="page-header">Infocenter - Person Details</h3>
</div>
</div>
<section>
<div class="row">
<div class="col-md-12">
<div class="col-lg-12">
<div class="panel panel-default">
<div class="panel-heading text-center"><h4>Stammdaten</h4></div>
<div class="panel-body">
<!-- </div>
<div class="row">-->
<div class="col-md-6">
<table class="table">
<tr>
<td><strong>Vorname</strong></td>
<td><?php echo $stammdaten->vorname ?></td>
</tr>
<tr>
<td><strong>Nachname</strong></td>
<td>
<?php echo $stammdaten->nachname ?></td>
</tr>
<tr>
<td><strong>Geburtsdatum</strong></td>
<td>
<?php echo date_format(date_create($stammdaten->gebdatum), 'd.m.Y') ?></td>
</tr>
<tr>
<td><strong>Sozialversicherungsnr</strong></td>
<td>
<?php echo $stammdaten->svnr ?></td>
<tr>
<td><strong>Staatsb&uuml;rgerschaft</strong></td>
<td>
<?php echo $stammdaten->staatsbuergerschaft ?></td>
<tr>
<td><strong>Geschlecht</strong></td>
<td>
<?php echo $stammdaten->geschlecht ?></td>
<tr>
<td><strong>Geburtsnation</strong></td>
<td>
<?php echo $stammdaten->geburtsnation ?></td>
<tr>
<td><strong>Geburtsort</strong></td>
<td><?php echo $stammdaten->gebort ?></td>
</table>
</div>
<!--<br />
Berufstätigkeit:-->
<div class="col-md-6">
<table class="table table-bordered">
<thead>
<tr>
<th colspan="4" class="text-center">Kontakte</th>
</tr>
<tr>
<th class="text-center">Typ</th>
<th class="text-center">Kontakt</th>
<th class="text-center">Zustellung</th>
<th class="text-center">Anmerkung</th>
</tr>
</thead>
<tbody>
<?php foreach ($stammdaten->kontakte as $kontakt): ?>
<div class="row">
<div class="col-lg-6">
<table class="table">
<tr>
<td><?php echo ucfirst($kontakt->kontakttyp); ?></td>
<td>
<?php if ($kontakt->kontakttyp === 'email'): ?>
<a href="mailto:<?php echo $kontakt->kontakt; ?>" target="_top">
<?php
endif;
echo $kontakt->kontakt;
if ($kontakt->kontakttyp === 'email'):
?>
</a>
<?php endif; ?>
</td>
<td class="text-center"><?php echo $kontakt->zustellung === true ? 'X' : ''; ?></td>
<td><?php echo $kontakt->anmerkung; ?></td>
<td><strong>Vorname</strong></td>
<td><?php echo $stammdaten->vorname ?></td>
</tr>
<?php endforeach; ?>
<?php foreach ($stammdaten->adressen as $adresse): ?>
<tr>
<td><strong>Nachname</strong></td>
<td>
Adresse
</td>
<?php echo $stammdaten->nachname ?></td>
</tr>
<tr>
<td><strong>Geburtsdatum</strong></td>
<td>
<?php echo isset($adresse) ? $adresse->strasse.', '.$adresse->plz.' '.$adresse->ort : '' ?>
</td>
<td class="text-center">
<?php echo $adresse->zustelladresse === true ? 'X' : '' ?>
</td>
<?php echo date_format(date_create($stammdaten->gebdatum), 'd.m.Y') ?></td>
</tr>
<tr>
<td><strong>Sozialversicherungsnr</strong></td>
<td>
<?php echo ($adresse->heimatadresse === true ? 'Heimatadresse' : '').($adresse->heimatadresse === true && $adresse->rechnungsadresse === true ? ', ' : '').($adresse->rechnungsadresse === true ? 'Rechnungsadresse' : ''); ?>
</td>
<tr/>
<?php endforeach; ?>
</tbody>
</table>
<?php echo $stammdaten->svnr ?></td>
<tr>
<td><strong>Staatsb&uuml;rgerschaft</strong></td>
<td>
<?php echo $stammdaten->staatsbuergerschaft ?></td>
<tr>
<td><strong>Geschlecht</strong></td>
<td>
<?php echo $stammdaten->geschlecht ?></td>
<tr>
<td><strong>Geburtsnation</strong></td>
<td>
<?php echo $stammdaten->geburtsnation ?></td>
<tr>
<td><strong>Geburtsort</strong></td>
<td><?php echo $stammdaten->gebort ?></td>
</table>
</div>
<div class="col-lg-6">
<table class="table table-bordered">
<thead>
<tr>
<th colspan="4" class="text-center">Kontakte</th>
</tr>
<tr>
<th class="text-center">Typ</th>
<th class="text-center">Kontakt</th>
<th class="text-center">Zustellung</th>
<th class="text-center">Anmerkung</th>
</tr>
</thead>
<tbody>
<?php foreach ($stammdaten->kontakte as $kontakt): ?>
<tr>
<td><?php echo ucfirst($kontakt->kontakttyp); ?></td>
<td>
<?php if ($kontakt->kontakttyp === 'email'): ?>
<a href="mailto:<?php echo $kontakt->kontakt; ?>" target="_top">
<?php
endif;
echo $kontakt->kontakt;
if ($kontakt->kontakttyp === 'email'):
?>
</a>
<?php endif; ?>
</td>
<td class="text-center"><?php echo $kontakt->zustellung === true ? '<span class="glyphicon glyphicon-ok"></span>' : ''; ?></td>
<td><?php echo $kontakt->anmerkung; ?></td>
</tr>
<?php endforeach; ?>
<?php foreach ($stammdaten->adressen as $adresse): ?>
<tr>
<td>
Adresse
</td>
<td>
<?php echo isset($adresse) ? $adresse->strasse.', '.$adresse->plz.' '.$adresse->ort : '' ?>
</td>
<td class="text-center">
<?php echo $adresse->zustelladresse === true ? '<span class="glyphicon glyphicon-ok"></span>' : '' ?>
</td>
<td>
<?php echo ($adresse->heimatadresse === true ? 'Heimatadresse' : '').($adresse->heimatadresse === true && $adresse->rechnungsadresse === true ? ', ' : '').($adresse->rechnungsadresse === true ? 'Rechnungsadresse' : ''); ?>
</td>
<tr/>
<?php endforeach; ?>
</tbody>
</table>
</div>
</div>
</div>
</div>
@@ -116,49 +113,76 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
</section>
<section>
<div class="row">
<div class="col-md-12">
<div class="col-lg-12">
<div class="panel panel-default">
<a name="DokPruef"></a>
<a name="DokPruef"></a><!-- anchor for jumping to the section -->
<div class="panel-heading text-center"><h4>Dokumentenpr&uuml;fung</h4></div>
<div class="panel-body">
<div class="col-md-12">
<table id="doctable" class="table table-striped table-bordered">
<thead>
<th>Name</th>
<th>Typ</th>
<th>Uploaddatum</th>
<th>formal gepr&uuml;ft</th>
<th>nachzureichen</th>
<th>nachgereicht am</th>
</thead>
<tbody>
<?php
foreach ($dokumente as $dokument):
$geprueft = isset($dokument->formal_geprueft_amum) ? "checked" : "";
<table id="doctable" class="table table-striped table-bordered">
<thead>
<th>Name</th>
<th>Typ</th>
<th>Uploaddatum</th>
<th>Formal gepr&uuml;ft</th>
<!-- <th>nachzureichen</th>
<th>nachgereicht am</th>-->
</thead>
<tbody>
<?php
foreach ($dokumente as $dokument):
$geprueft = isset($dokument->formal_geprueft_amum) ? "checked" : "";
?>
<tr>
<td>
<a href="../outputAkteContent/<?php echo $dokument->akte_id ?>"><?php echo empty($dokument->titel) ? $dokument->bezeichnung : $dokument->titel ?></a>
</td>
<td><?php echo $dokument->dokument_bezeichnung ?></td>
<td><?php echo date_format(date_create($dokument->erstelltam), 'd.m.Y') ?></td>
<td>
<input type="checkbox"
id="prchkbx<?php echo $dokument->akte_id ?>" <?php echo $geprueft ?> />
<?php echo isset($dokument->formal_geprueft_amum) ? date_format(date_create($dokument->formal_geprueft_amum), 'd.m.Y') : ''; ?>
</td>
<!-- <td class="text-center">
<?php /*echo $dokument->nachgereicht === true ? 'X' : ''; */
?>
<tr>
<td>
<a href="../outputAkteContent/<?php echo $dokument->akte_id ?>"><?php echo empty($dokument->titel) ? $dokument->bezeichnung : $dokument->titel ?></a>
</td>
<td><?php echo $dokument->dokument_kurzbz ?></td>
<td><?php echo date_format(date_create($dokument->erstelltam), 'd.m.Y') ?></td>
<td>
<input type="checkbox"
id="prchkbx<?php echo $dokument->akte_id ?>" <?php echo $geprueft ?> />
<?php echo isset($dokument->formal_geprueft_amum) ? date_format(date_create($dokument->formal_geprueft_amum), 'd.m.Y') : ''; ?>
</td>
<td class="text-center">
<?php echo $dokument->nachgereicht === true ? 'X' : ''; ?>
</td>
<td>
<?php echo isset($dokument->nachgereicht_am) ? date_format(date_create($dokument->nachgereicht_am), 'd.m.Y') : ''; ?>
</td>
</tr>
<?php endforeach ?>
</tbody>
</table>
</div>
</td>
<td>
<?php /*echo isset($dokument->nachgereicht_am) ? date_format(date_create($dokument->nachgereicht_am), 'd.m.Y') : ''; */
?>
</td>-->
</tr>
<?php endforeach ?>
</tbody>
</table>
<?php if (count($dokumente_nachgereicht) > 0):?>
<br/>
<p>Nachzureichende Dokumente:</p>
<table id="nachgdoctable" class="table table-striped table-bordered">
<thead>
<th>Typ</th>
<th>Eintragsdatum</th>
<th>Nachzureichen am</th>
<th>Anmerkung</th>
</thead>
<tbody>
<?php
foreach ($dokumente_nachgereicht as $dokument):
?>
<tr>
<td><?php echo $dokument->dokument_bezeichnung ?></td>
<td><?php echo date_format(date_create($dokument->erstelltam), 'd.m.Y') ?></td>
<td>
<?php echo isset($dokument->nachgereicht_am) ? date_format(date_create($dokument->nachgereicht_am), 'd.m.Y') : ''; ?>
</td>
<td>
<?php echo $dokument->anmerkung; ?>
</td>
</tr>
<?php endforeach ?>
</tbody>
</table>
<?php endif; ?>
</div>
</div>
</div>
@@ -176,34 +200,36 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
<div class="panel-group">
<?php
foreach ($zgvpruefungen as $zgvpruefung): ?>
<div class="panel panel-default">
<div class="panel-heading">
Studiengang <?php echo $zgvpruefung->studiengang ?>
<h4 class="panel-title">
<a data-toggle="collapse" href="#collapse<?php echo $zgvpruefung->studiengang ?>">Studiengang <?php echo $zgvpruefung->studiengang ?></a>
</h4>
</div>
<div id="collapse<?php echo $zgvpruefung->studiengang ?>" class="panel-collapse collapse<?php echo $zgvpruefung->prestudentstatus->status_kurzbz === 'Interessent' ? 'in' : '' ?>">
<div class="panel-body">
<form method="post"
action="../saveZgvPruefung/<?php echo $zgvpruefung->prestudent_id ?>">
<div class="row">
<div class="col-md-5">
<div class="col-lg-4">
<div class="form-group">
<label>Freigegeben an Studiengang: </label>
<?php echo isset($zgvpruefung->prestudentstatus->bestaetigtam) ? "ja" : "nein" ?>
</div>
</div>
<div class="col-md-3">
<div class="col-lg-3">
<div class="form-group">
<label>Letzter Status: </label>
<?php echo $zgvpruefung->prestudentstatus->status_kurzbz ?>
</div>
</div>
<div class="col-md-2">
<div class="col-lg-2">
<div class="form-group">
<label>Studiensemester: </label>
<?php echo $zgvpruefung->prestudentstatus->studiensemester_kurzbz ?>
</div>
</div>
<div class="col-md-2">
<div class="col-lg-3">
<div class="form-group">
<label>Ausbildungssemester: </label>
<?php echo $zgvpruefung->prestudentstatus->ausbildungssemester ?>
@@ -211,7 +237,7 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
</div>
</div>
<div class="row">
<div class="col-md-5">
<div class="col-lg-4">
<div class="form-group">
<label>ZGV: </label>
<?php echo $this->widgetlib->widget(
@@ -221,7 +247,7 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
); ?>
</div>
</div>
<div class="col-md-3">
<div class="col-lg-3">
<div class="form-group">
<label>ZGV Ort: </label>
<input type="text" class="form-control"
@@ -229,7 +255,7 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
name="zgvort">
</div>
</div>
<div class="col-md-2">
<div class="col-lg-2">
<div class="form-group">
<label>ZGV Datum: </label>
<input type="text" class="dateinput form-control"
@@ -237,7 +263,7 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
name="zgvdatum">
</div>
</div>
<div class="col-md-2">
<div class="col-lg-3">
<div class="form-group">
<label>ZGV Nation: </label>
<?php echo $this->widgetlib->widget(
@@ -251,7 +277,7 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
<!-- show only master zgv if master studiengang - start -->
<?php if ($zgvpruefung->studiengangtyp === 'm') : ?>
<div class="row">
<div class="col-md-5">
<div class="col-lg-4">
<div class="form-group"><label>ZGV Master: </label>
<?php echo $this->widgetlib->widget(
'Zgvmaster_widget',
@@ -260,21 +286,21 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
); ?>
</div>
</div>
<div class="col-md-3">
<div class="col-lg-3">
<div class="form-group"><label>ZGV Master Ort: </label>
<input type="text" class="form-control"
value="<?php echo $zgvpruefung->zgvmaort ?>"
name="zgvmaort">
</div>
</div>
<div class="col-md-2">
<div class="col-lg-2">
<div class="form-group"><label>ZGV Master Datum: </label>
<input type="text" class="dateinput form-control"
value="<?php echo empty($zgvpruefung->zgvmadatum) ? "" : date_format(date_create($zgvpruefung->zgvmadatum), 'd.m.Y') ?>"
name="zgvmadatum">
</div>
</div>
<div class="col-md-2">
<div class="col-lg-3">
<div class="form-group"><label>ZGV Master Nation: </label>
<?php echo $this->widgetlib->widget(
'Nation_widget',
@@ -287,7 +313,7 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
<!-- show only master zgv if master studiengang - end -->
<?php endif; ?>
<div class="row">
<div class="col-md-12">
<div class="col-lg-12">
<button type="submit" class="btn btn-default">Speichern</button>
</div>
</div>
@@ -301,7 +327,7 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
<div class="row">
<form method="post"
action="../saveAbsage/<?php echo $zgvpruefung->prestudent_id ?>">
<div class="col-md-12">
<div class="col-lg-12">
<div class="form-group">
<label class="d-inline float-left">Absagegrund:</label>
<select name="statusgrund" class="d-inline float-right">
@@ -321,11 +347,10 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
</div>
</form>
</div>
<?php endif; ?>
</div>
</div>
</div>
<?php endforeach // end foreach zgvpruefungen?>
</div>
</div>
@@ -336,64 +361,68 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
<section>
<a name="NotizAkt"></a>
<div class="row">
<div class="col-md-12">
<div class="col-lg-12">
<div class="panel panel-default">
<div class="panel-heading text-center">
<h4 class="text-center">Notizen &amp; Aktivit&auml;ten</h4>
</div>
<div class="panel-body">
<div class="col-md-6">
<form method="post" action="../saveNotiz/<?php echo $stammdaten->person_id ?>">
<div class="form-group">
<div class="text-center">
<label>Notiz hinzuf&uuml;gen</label>
</div>
<div class="row">
<div class="col-lg-6">
<form method="post" action="../saveNotiz/<?php echo $stammdaten->person_id ?>">
<div class="form-group">
<label>Titel: </label><input type="text" class="form-control"
name="notiztitel"/>
<div class="text-center">
<label>Notiz hinzuf&uuml;gen</label>
</div>
<div class="form-group">
<label>Titel: </label><input type="text" class="form-control"
name="notiztitel"/>
</div>
<div class="form-group">
<label>Text: </label><textarea name="notiz" class="form-control" rows="10"
cols="32"></textarea>
</div>
<button type="submit" class="btn btn-default">Speichern</button>
</div>
<div class="form-group">
<label>Text: </label><textarea name="notiz" class="form-control" rows="10"
cols="32"></textarea>
</div>
<button type="submit" class="btn btn-default">Speichern</button>
</div>
</form>
<table id="notiztable" class="table table-bordered table-hover">
<thead>
<th>Datum</th>
<th>Notiz</th>
<th>User</th>
</thead>
<tbody>
</form>
<table id="notiztable" class="table table-bordered table-hover">
<thead>
<th>Datum</th>
<th>Notiz</th>
<th>User</th>
</thead>
<tbody>
<?php foreach ($notizen as $notiz): ?>
<tr>
<td><?php echo date_format(date_create($notiz->insertamum), 'd.m.Y H:i:s') ?></td>
<td><?php echo $notiz->titel ?></td>
<td><?php echo $notiz->verfasser_uid ?></td>
</tr>
<?php endforeach ?>
</tbody>
</table>
</div>
<div class="col-md-6">
<table id="logtable" class="table table-bordered table-hover">
<thead>
<th>Datum</th>
<th>Aktivit&auml;t</th>
<th>User</th>
</thead>
<tbody>
<?php foreach ($logs as $log): ?>
<tr>
<td><?php echo date_format(date_create($log->zeitpunkt), 'd.m.Y H:i:s') ?></td>
<td><?php echo isset($log->logdata->name) ? $log->logdata->name : '' ?></td>
<td><?php echo $log->insertvon ?></td>
</tr>
<?php endforeach ?>
</tbody>
</table>
<?php foreach ($notizen as $notiz): ?>
<tr data-toggle="tooltip"
title="<?php echo isset($notiz->text) ? $notiz->text : '' ?>">
<td><?php echo date_format(date_create($notiz->insertamum), 'd.m.Y H:i:s') ?></td>
<td><?php echo $notiz->titel ?></td>
<td><?php echo $notiz->verfasser_uid ?></td>
</tr>
<?php endforeach ?>
</tbody>
</table>
</div>
<div class="col-lg-6">
<table id="logtable" class="table table-bordered table-hover">
<thead>
<th>Datum</th>
<th>Aktivit&auml;t</th>
<th>User</th>
</thead>
<tbody>
<?php foreach ($logs as $log): ?>
<tr data-toggle="tooltip"
title="<?php echo isset($log->logdata->message) ? $log->logdata->message : '' ?>">
<td><?php echo date_format(date_create($log->zeitpunkt), 'd.m.Y H:i:s') ?></td>
<td><?php echo isset($log->logdata->name) ? $log->logdata->name : '' ?></td>
<td><?php echo $log->insertvon ?></td>
</tr>
<?php endforeach ?>
</tbody>
</table>
</div>
</div>
</div>
</div>
@@ -455,11 +484,19 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
"paging": false,
"searching": false,
"info": false,
"order": [[2, "desc"]]
"order": [[2, "desc"], [1, "asc"]]
});
$("#nachgdoctable").DataTable({
"language": {"url": german},
"responsive": true,
"paging": false,
"searching": false,
"info": false,
"order": [[2, "asc"], [1, "desc"]]
});
$("#logtable").DataTable({
"language": {"url": german},
"responsive": true,
"responsive": false,
"lengthChange": false,
"info": false,
"pageLength": 25,
@@ -468,7 +505,7 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
});
$("#notiztable").DataTable({
"language": {"url": german},
"responsive": true,
"responsive": false,
"lengthChange": false,
"info": false,
"pageLength": 13,
@@ -476,7 +513,8 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
"drawCallback": drawCallback
});
$(".dateinput").datepicker({
"dateFormat": "dd.mm.yy"
"language": "de",
"format": "dd.mm.yyyy"
});
//javascript hack - not nice!
$("select").addClass('form-control');
application/views/templates/FHC-Header.php
+8
View File
@@ -12,6 +12,7 @@ $jquery3 = isset($jquery3) ? $jquery3 : false;
$jqueryui = isset($jqueryui) ? $jqueryui : false;
$bootstrap = isset($bootstrap) ? $bootstrap : false;
$fontawesome = isset($fontawesome) ? $fontawesome : false;
$bootstrapdatepicker = isset($bootstrapdatepicker) ? $bootstrapdatepicker : false;
$datatables = isset($datatables) ? $datatables : false;
$tablesorter = isset($tablesorter) ? $tablesorter : false;
@@ -94,6 +95,8 @@ function _generateJSsInclude($JSs)
if ($bootstrap === true) _generateCSSsInclude('vendor/components/bootstrap/css/bootstrap.min.css');
// font awesome CSS
if ($fontawesome === true) _generateCSSsInclude('vendor/components/font-awesome/css/font-awesome.min.css');
// bootstrap datepicker CSS
if ($bootstrapdatepicker === true) _generateCSSsInclude('vendor/eternicode/bootstrap-datepicker/dist/css/bootstrap-datepicker3.min.css');
// datatables CSS
if ($datatables === true)
{
@@ -114,6 +117,11 @@ function _generateJSsInclude($JSs)
if ($jqueryui === true) _generateJSsInclude('vendor/components/jqueryui/jquery-ui.min.js');
// bootstrap JS
if ($bootstrap === true) _generateJSsInclude('vendor/components/bootstrap/js/bootstrap.min.js');
// bootstrap datepicker JS
if ($bootstrapdatepicker === true){
_generateJSsInclude('vendor/eternicode/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js');
_generateJSsInclude('vendor/eternicode/bootstrap-datepicker/dist/locales/bootstrap-datepicker.de.min.js');
}
// datatables JS
if ($datatables === true)
{
composer.json
+2 -1
View File
@@ -251,7 +251,8 @@
"components/font-awesome": "^4.7",
"moment/moment": "^2.20",
"datatables/datatables": "^1.10",
"datatables/plugins": "^3.3"
"datatables/plugins": "^3.3",
"eternicode/bootstrap-datepicker": "^1.7"
},
"require-dev": {
"squizlabs/php_codesniffer": "2.*"
composer.lock
Generated
+57 -2
View File
@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "28942746c1b00b590a3d3cb43cd21606",
"content-hash": "2c99452d2bf338a1d1e3462197ab25b7",
"hash": "b386e8ea62cfd8c96c6697729860cc5a",
"content-hash": "65e7f00446fd7f602e914089cedaa931",
"packages": [
{
"name": "BlackrockDigital/startbootstrap-sb-admin-2",
@@ -775,6 +775,61 @@
],
"time": "2015-02-27 09:45:49"
},
{
"name": "eternicode/bootstrap-datepicker",
"version": "v1.7.1",
"source": {
"type": "git",
"url": "https://github.com/uxsolutions/bootstrap-datepicker.git",
"reference": "4c12834aae54782ca41d9409d6334193f200124d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/uxsolutions/bootstrap-datepicker/zipball/4c12834aae54782ca41d9409d6334193f200124d",
"reference": "4c12834aae54782ca41d9409d6334193f200124d",
"shasum": ""
},
"require": {
"components/bootstrap": ">=2.0, <4.0",
"components/jquery": ">=1.7.1, <4.0.0",
"robloach/component-installer": "*"
},
"type": "component",
"extra": {
"component": {
"scripts": [
"js/bootstrap-datepicker.js"
],
"styles": [
"dist/css/bootstrap-datepicker.css",
"dist/css/bootstrap-datepicker3.css"
],
"files": [
"js/locales/bootstrap-datepicker.*.js"
]
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"Apache-2.0"
],
"authors": [
{
"name": "Andrew Rowls",
"email": "eternicode@gmail.com"
},
{
"name": "Community",
"homepage": "https://github.com/uxsolutions/bootstrap-datepicker/contributors"
}
],
"description": "A datepicker for Bootstrap",
"keywords": [
"bootstrap",
"datepicker"
],
"time": "2017-07-06 12:14:34"
},
{
"name": "fgelinas/timepicker",
"version": "0.3.3",