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

typo fix in getDateStyleClass; fix selectAll button in Assistenz view;

Browse Source
This commit is contained in:
Johann Hoffmann
2026-01-08 14:40:24 +01:00
parent 3d82d69bfc
commit 80175f46cb
4 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+1 -1
View File
@@ -334,7 +334,7 @@ export const AbgabeMitarbeiterDetail = {
else if(abgabedatum > datum) {
return 'verspaetet' // needs upload, missed it and has submitted smth late
} else if(!termin.upload_allowed) {
if(datum > today) return termin.diffinday <= 12 ? 'abzugeben' : 'standard'
if(datum > today) return termin.diffindays <= 12 ? 'abzugeben' : 'standard'
else if (today > datum) return 'abgegeben'
} else {
return 'abgegeben' // nothing else to do for that termin
public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+5
View File
@@ -514,6 +514,11 @@ export const AbgabeStudentDetail = {
</AccordionTab>
</template>
</Accordion>
<div v-if="projektarbeit?.abgabetermine.length == 0" style="display:flex; justify-content: center; align-content: center;">
<h5>{{ $capitalize( $p.t('abgabetool/c4keineAbgabetermineGefunden') )}}</h5>
</div>
</div>
<bs-modal
public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+5 -1
View File
@@ -116,6 +116,7 @@ export const AbgabetoolAssistenz = {
{
formatter: function (cell, formatterParams, onRendered) {
// create the built-in checkbox
if(!cell.getRow().getData().selectable) return
let checkbox = document.createElement("input");
checkbox.type = "checkbox";
@@ -628,6 +629,9 @@ export const AbgabetoolAssistenz = {
// const now = luxon.DateTime.now();
return projekte.map(projekt => {
// in assistenz context every projektarbeit should be allowed to be selected i guess
projekt.selectable = true;
projekt.prevTermin = null;
projekt.nextTermin = null;
@@ -729,7 +733,7 @@ export const AbgabetoolAssistenz = {
else if(abgabedatum > datum) {
return 'verspaetet' // needs upload, missed it and has submitted smth late
} else if(!termin.upload_allowed) {
if(datum > today) return termin.diffinday <= 12 ? 'abzugeben' : 'standard'
if(datum > today) return termin.diffindays <= 12 ? 'abzugeben' : 'standard'
else if (today > datum) return 'abgegeben'
} else {
return 'abgegeben' // nothing else to do for that termin
public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+1 -1
View File
@@ -74,7 +74,7 @@ export const AbgabetoolStudent = {
else if(abgabedatum > datum) {
return 'verspaetet' // needs upload, missed it and has submitted smth late
} else if(!termin.upload_allowed) {
if(datum > today) return termin.diffinday <= 12 ? 'abzugeben' : 'standard'
if(datum > today) return termin.diffindays <= 12 ? 'abzugeben' : 'standard'
else if (today > datum) return 'abgegeben'
} else {
return 'abgegeben' // nothing else to do for that termin