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

tabulator upgrade

Browse Source
This commit is contained in:
SimonGschnell
2024-03-06 14:46:21 +01:00
parent e41e24be04
commit 464799d22b
5 changed files with 62 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
+40 -34
View File
@@ -7,7 +7,8 @@ $this->load->view(
'jqueryui1' => true,
'bootstrap5' => true,
'fontawesome4' => true,
'tabulator4' => true,
'tabulator5' => true,
'tabulator5JQuery' => true,
'ajaxlib' => true,
'dialoglib' => true,
'cis'=>true,
@@ -83,6 +84,9 @@ $this->load->view(
'customJSs' => array(
//'public/js/bootstrapper5.js',
'public/js/lehre/anrechnung/approveAnrechnungUebersicht.js'
),
'customCSSs' => array(
'public/css/lehre/anrechnung.css'
)
)
);
@@ -129,65 +133,67 @@ $this->load->view(
</div>
<!-- Tabelle -->
<div class="row">
<div class="col-xs-12">
<div class="col-12">
<?php $this->load->view('lehre/anrechnung/approveAnrechnungUebersichtData.php'); ?>
</div>
</div>
<!-- Genehmigen / Ablehnen Panel -->
<div class="row">
<div class="panel panel-default panel-body" style="display: none"
<div class="border border-1 mb-4" style="display: none"
id="approveAnrechnungUebersicht-begruendung-panel">
<div>
<div class="mb-4 col-12">
<h4 class="panel panel-body panel-danger text-danger"><?php echo $this->p->t('anrechnung', 'genehmigungenNegativQuestion'); ?></h4>
&nbsp;<b><?php echo $this->p->t('anrechnung', 'bitteBegruendungAngeben'); ?>
<span class="text-danger">
<?php echo $this->p->t('anrechnung', 'begruendungWirdFuerAlleUebernommen'); ?>
</span></b>
<br><br>
<ol class="list-group">
<h4 class="card card-body border-danger text-danger my-3"><?php echo $this->p->t('anrechnung', 'genehmigungenNegativQuestion'); ?></h4>
<div class="mb-4">
<b><?php echo $this->p->t('anrechnung', 'bitteBegruendungAngeben'); ?>
<span class="text-danger">
<?php echo $this->p->t('anrechnung', 'begruendungWirdFuerAlleUebernommen'); ?>
</span></b>
</div>
<ol class="list-group mb-4">
<li class="list-group-item"><?php echo $this->p->t('anrechnung', 'genehmigungNegativPruefungNichtMoeglich'); ?>
<span class="btn-copyIntoTextarea pull-right" data-toggle="tooltip" data-placement="left"
<span role="button" class="btn-copyIntoTextarea float-end" data-bs-toggle="tooltip" data-bs-placement="left"
title="<?php echo $this->p->t('ui', 'textUebernehmen'); ?>">
<i class="fa fa-clipboard fa-lg" aria-hidden="true"></i>
</span>
</li>
<li class="list-group-item"><?php echo $this->p->t('anrechnung', 'genehmigungNegativEctsHoechstgrenzeUeberschritten'); ?>
<span class="btn-copyIntoTextarea pull-right" data-toggle="tooltip" data-placement="left"
<span role="button" class="btn-copyIntoTextarea float-end" data-bs-toggle="tooltip" data-bs-placement="left"
title="<?php echo $this->p->t('ui', 'textUebernehmen'); ?>">
<i class="fa fa-clipboard fa-lg" aria-hidden="true"></i>
</span>
</li>
<li class="list-group-item disabled"><?php echo $this->p->t('anrechnung', 'genehmigungNegativKenntnisseNichtGleichwertigWeilHinweis'); ?></li>
<li class="list-group-item list-group-item-secondary"><?php echo $this->p->t('anrechnung', 'genehmigungNegativKenntnisseNichtGleichwertigWeilHinweis'); ?></li>
</ol>
<textarea class="form-control" name="begruendung" id="approveAnrechnungUebersicht-begruendung"
rows="2"
placeholder="<?php echo $this->p->t('anrechnung', 'textUebernehmenOderEigenenBegruendungstext'); ?>" required></textarea>
</div>
<br>
<!-- Action Button 'Abbrechen'-->
<div class="pull-right">
<div class="mb-4 d-flex justify-content-end" >
<button id="approveAnrechnungUebersicht-begruendung-abbrechen"
class="btn btn-default btn-w200" type="reset">
class="btn btn-outline-secondary btn-w200 ms-1" type="reset">
<?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
</button>
<button id="approveAnrechnungUebersicht-reject-anrechnungen-confirm"
class="btn btn-primary btn-w200" type="button">
class="btn btn-primary btn-w200 ms-1" type="button">
<?php echo ucfirst($this->p->t('ui', 'bestaetigen')); ?>
</button>
</div>
</div>
<div class="panel panel-default panel-body" style="display: none"
<div class="border border-1 mb-4" style="display: none"
id="approveAnrechnungUebersicht-genehmigung-panel">
<div>
<h4 class="panel panel-body panel-success text-success"><?php echo $this->p->t('anrechnung', 'genehmigungenPositivQuestion'); ?></h4>
&ensp;<?php echo $this->p->t('anrechnung', 'genehmigungenPositiv'); ?><br><br>
<h4 class="card card-body border-success text-success my-3"><?php echo $this->p->t('anrechnung', 'genehmigungenPositivQuestion'); ?></h4>
<div class="ps-2 mb-4"><?php echo $this->p->t('anrechnung', 'genehmigungenPositiv'); ?></div>
</div>
<br>
<!-- Action Button 'Abbrechen'-->
<div class="pull-right">
<div class="mb-4 d-flex justify-content-end">
<button id="approveAnrechnungUebersicht-empfehlung-abbrechen"
class="btn btn-default btn-w200" type="reset">
class="btn btn-outline-secondary btn-w200" type="reset">
<?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
</button>
<button id="approveAnrechnungUebersicht-approve-anrechnungen-confirm"
@@ -204,49 +210,49 @@ $this->load->view(
<div class="btn-toolbar" role="toolbar">
<div class="btn-group" role="group">
<button id="show-inProgressDP" class="btn btn-outline-secondary btn-clearfilter" type="button"
data-toggle="tooltip" data-placement="left"
data-bs-toggle="tooltip" data-bs-placement="left"
title="<?php echo $this->p->t('ui', 'alleInBearbeitungSTGL'); ?>">
<i class='fa fa-eye'></i>
</button>
<button id="show-inProgressLektor" class="btn btn-outline-secondary btn-clearfilter" type="button"
data-toggle="tooltip" data-placement="left"
data-bs-toggle="tooltip" data-bs-placement="left"
title="<?php echo $this->p->t('ui', 'alleInBearbeitungLektor'); ?>"><i
class='fa fa-clock-o'></i>
</button>
<button id="show-recommended" class="btn btn-outline-secondary btn-clearfilter" type="button"
data-toggle="tooltip" data-placement="left"
data-bs-toggle="tooltip" data-bs-placement="left"
title="<?php echo $this->p->t('ui', 'nurEmpfohleneAnzeigen'); ?>"><i
class='fa fa-thumbs-o-up'></i>
</button>
<button id="show-not-recommended" class="btn btn-outline-secondary btn-clearfilter" type="button"
data-toggle="tooltip" data-placement="left"
data-bs-toggle="tooltip" data-bs-placement="left"
title="<?php echo $this->p->t('ui', 'nurNichtEmpfohleneAnzeigen'); ?>"><i
class='fa fa-thumbs-o-down'></i>
</button>
<button id="show-approved" class="btn btn-outline-secondary btn-clearfilter" type="button"
data-toggle="tooltip" data-placement="left"
data-bs-toggle="tooltip" data-bs-placement="left"
title="<?php echo $this->p->t('ui', 'nurGenehmigteAnzeigen'); ?>"><i
class='fa fa-check'></i>
</button>
<button id="show-rejected" class="btn btn-outline-secondary btn-clearfilter" type="button"
data-toggle="tooltip" data-placement="left"
data-bs-toggle="tooltip" data-bs-placement="left"
title="<?php echo $this->p->t('ui', 'nurAbgelehnteAnzeigen'); ?>"><i
class='fa fa-times'></i>
</button>
</div>
<a type="button" id="approveAnrechnungUebersicht-create-anrechnung" class="btn btn-default" style="margin-left: 20px;" href='<?php echo site_url('lehre/anrechnung/createAnrechnung') ?>' target='_blank'>
<a type="button" id="approveAnrechnungUebersicht-create-anrechnung" class="btn btn-outline-secondary ms-4" href='<?php echo site_url('lehre/anrechnung/createAnrechnung') ?>' target='_blank'>
<i class='fa fa-plus' aria-hidden='true'></i> <?php echo $this->p->t('global', 'antragAnlegen'); ?>
</a>
</div>
</div>
<!-- Action Buttons 'Genehmigen', Ablehnen, 'Empfehlung anfordern'-->
<div class="col-xs-8 col-md-7">
<div class="pull-right">
<div class="col-8 col-md-7">
<div class="d-flex justify-content-end">
<button id="approveAnrechnungUebersicht-request-recommendation"
class="btn btn-default btn-w200 btn-mr50" type="button">
class="btn btn-outline-secondary btn-w200 me-5" type="button">
<?php echo ucfirst($this->p->t('anrechnung', 'empfehlungAnfordern')); ?></button>
<button id="approveAnrechnungUebersicht-reject-anrechnungen-ask"
class="btn btn-danger btn-w200" type="button">
class="btn btn-danger btn-w200 me-1" type="button">
<?php echo ucfirst($this->p->t('global', 'ablehnen')); ?></button>
<button id="approveAnrechnungUebersicht-approve-anrechnungen-ask"
class="btn btn-primary btn-w200" type="button">
application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
+4 -2
View File
@@ -215,7 +215,8 @@ $filterWidgetArray = array(
selectableRangeMode: "click", // allow range selection using shift end click on end of range
selectablePersistence:false, // deselect previously selected rows when table is filtered, sorted or paginated
tableBuilt: function(){
func_tableBuilt(this);
//func_tableBuilt(this);
},
tableWidgetFooter: {
selectButtons: false
@@ -224,7 +225,7 @@ $filterWidgetArray = array(
return func_selectableCheck(row);
},
rowFormatter:function(row){
func_rowFormatter(row);
func_rowFormatter(row,this);
},
rowSelectionChanged:function(data, rows){
func_rowSelectionChanged(data, rows);
@@ -253,6 +254,7 @@ $filterWidgetArray = array(
ectsSumSchulisch: {visible: false, headerFilter:"input", align:"right"},
ectsSumBeruflich: {visible: false, headerFilter:"input", align:"right"},
begruendung: {headerFilter:"input", visible: true},
student: {headerFilter:"input"},
zgv: {headerFilter:"input"},
dokument_bezeichnung: {headerFilter:"input", formatter:"link", formatterParams: paramLookup_dokBez},
application/views/templates/FHC-Footer.php
+1
View File
@@ -100,6 +100,7 @@
// Tabulator 5 JS
if ($tabulator5 === true) generateJSsInclude('vendor/olifolkerd/tabulator5/dist/js/tabulator.min.js');
if ($tabulator5JQuery === true) generateJSsInclude('vendor/olifolkerd/tabulator5/dist/js/jquery_wrapper.js');
// Tinymce 3 JS
if ($tinymce3 === true) generateJSsInclude('include/tiny_mce/tiny_mce.js');
public/js/TableWidget.js
+1
View File
@@ -562,6 +562,7 @@ var FHC_TableWidget = {
// Renders the tabulator
tableWidgetDiv.find("#tableWidgetTabulator").tabulator(options);
}
}
public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
+16 -5
View File
@@ -17,6 +17,15 @@ var tabulator = null; // Set in tableBuilt function.
// Array with accumulated LV ECTS by Prestudent. Used to find out if max ECTS are exceeded.
var selectedPrestudentWithAccumulatedLvEcts = [];
let ttw = $('div[tableUniqueId="approveAnrechnungUebersicht"]');
ttw.tabulator("on","tableBuilt", function(){
console.log("this is just a test");
});
// -----------------------------------------------------------------------------------------------------------------
// Mutators - setter methods to manipulate table data when entering the tabulator
// -----------------------------------------------------------------------------------------------------------------
@@ -147,6 +156,8 @@ var format_ectsSumBisherUndNeu = function(cell, formatterParams, onRendered){
// Formats the rows
function func_rowFormatter(row){
let status_kurzbz = row.getData().status_kurzbz;
// If status is anything else then 'Bearbeitet von STGL-Leitung'
@@ -157,7 +168,7 @@ function func_rowFormatter(row){
// ...but leave url links selectable
row.getCell('dokument_bezeichnung').getElement().firstChild.style["pointerEvents"] = "auto";
row.getCell('details').getElement().firstChild.style["pointerEvents"] = "auto";
//row.getCell('details').getElement().firstChild.style["pointerEvents"] = "auto";
// Color background grey
row.getElement().style["background-color"] = COLOR_LIGHTGREY; // default
@@ -660,16 +671,16 @@ var approveAnrechnung = {
switch (status_kurzbz) {
case ANRECHNUNGSTATUS_APPROVED:
$('#requestAnrechnung-status_kurzbz').closest('div').addClass('alert-success');
$('#requestAnrechnung-status_kurzbz').closest('div').addClass('bg-success-subtle');
break;
case ANRECHNUNGSTATUS_REJECTED:
$('#requestAnrechnung-status_kurzbz').closest('div').addClass('alert-danger');
$('#requestAnrechnung-status_kurzbz').closest('div').addClass('bg-danger-subtle');
break;
case '':
$('#requestAnrechnung-status_kurzbz').closest('div').addClass('alert-info');
$('#requestAnrechnung-status_kurzbz').closest('div').addClass('bg-info-subtle');
break;
default:
$('#requestAnrechnung-status_kurzbz').closest('div').addClass('alert-warning');
$('#requestAnrechnung-status_kurzbz').closest('div').addClass('bg-warning-subtle');
}
},
disableEditElements: function()