mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-15 22:12:16 +00:00
typo fix in getDateStyleClass; fix selectAll button in Assistenz view; change the upload_allowed checkbox on change as expected; give fhcAlert primevue btn classes instead of bootstrap so they actually get applied; save convert js date to iso string to avoid timezone shenanigans; created zusatzdaten edit phrase;
This commit is contained in:
@@ -43,13 +43,23 @@ export default {
|
||||
};
|
||||
},
|
||||
postProjektarbeitAbgabe(termin) {
|
||||
|
||||
let dateString = termin.datum
|
||||
if(termin.datum instanceof Date) {
|
||||
const year = termin.datum.getFullYear();
|
||||
const month = String(termin.datum.getMonth() + 1).padStart(2, '0');
|
||||
const day = String(termin.datum.getDate()).padStart(2, '0');
|
||||
|
||||
dateString = `${year}-${month}-${day}`
|
||||
}
|
||||
|
||||
return {
|
||||
method: 'post',
|
||||
url: '/api/frontend/v1/Abgabe/postProjektarbeitAbgabe',
|
||||
params: {
|
||||
paabgabe_id: termin.paabgabe_id,
|
||||
paabgabetyp_kurzbz: termin.bezeichnung.paabgabetyp_kurzbz,
|
||||
datum: termin.datum,
|
||||
datum: dateString,
|
||||
note: termin.note_pk,
|
||||
upload_allowed: !!termin.upload_allowed,
|
||||
beurteilungsnotiz: termin.beurteilungsnotiz ?? '',
|
||||
|
||||
@@ -230,11 +230,11 @@ export const AbgabeMitarbeiterDetail = {
|
||||
async validateZusatzdaten() {
|
||||
// just ask once
|
||||
if(await this.$fhcAlert.confirm({
|
||||
message: this.$p.t('abgabetool/confirmEnduploadSpeichern'),
|
||||
message: this.$p.t('abgabetool/confirmZusatzdatenSpeichern'),
|
||||
acceptLabel: this.$capitalize(this.$p.t('abgabetool/c4AcceptAndProceed')),
|
||||
acceptClass: 'btn btn-danger',
|
||||
acceptClass: 'p-button-primary',
|
||||
rejectLabel: this.$capitalize(this.$p.t('abgabetool/c4Cancel')),
|
||||
rejectClass: 'btn btn-outline-secondary'
|
||||
rejectClass: 'p-button-secondary'
|
||||
}) === false) {
|
||||
return false
|
||||
}
|
||||
@@ -245,9 +245,9 @@ export const AbgabeMitarbeiterDetail = {
|
||||
if(await this.$fhcAlert.confirm({
|
||||
message: this.$p.t('abgabetool/c4confirm_delete'),
|
||||
acceptLabel: 'Löschen',
|
||||
acceptClass: 'btn btn-danger',
|
||||
acceptClass: 'p-button-danger',
|
||||
rejectLabel: 'Zurück',
|
||||
rejectClass: 'btn btn-outline-secondary'
|
||||
rejectClass: 'p-button-secondary'
|
||||
}) === false) {
|
||||
return false
|
||||
} else {
|
||||
|
||||
@@ -59,9 +59,9 @@ export const AbgabeStudentDetail = {
|
||||
if(await this.$fhcAlert.confirm({
|
||||
message: this.$p.t('abgabetool/confirmEnduploadSpeichern'),
|
||||
acceptLabel: this.$capitalize(this.$p.t('abgabetool/c4AcceptAndProceed')),
|
||||
acceptClass: 'btn btn-danger',
|
||||
acceptClass: 'p-button-primary',
|
||||
rejectLabel: this.$capitalize(this.$p.t('abgabetool/c4Cancel')),
|
||||
rejectClass: 'btn btn-outline-secondary'
|
||||
rejectClass: 'p-button-secondary'
|
||||
}) === false) {
|
||||
return false
|
||||
}
|
||||
|
||||
@@ -1067,7 +1067,6 @@ export const AbgabetoolAssistenz = {
|
||||
:style="{'width': '100%'}"
|
||||
v-model="serienTermin.bezeichnung"
|
||||
:options="abgabeTypeOptions"
|
||||
@change="handleChangeAbgabetypSerientermin(termin)"
|
||||
:optionLabel="getOptionLabelAbgabetyp">
|
||||
</Dropdown>
|
||||
</div>
|
||||
|
||||
@@ -432,7 +432,13 @@ export const AbgabetoolMitarbeiter = {
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
'serienTermin.bezeichnung'(newVal) {
|
||||
if(newVal?.paabgabetyp_kurzbz === 'qualgate1' || newVal?.paabgabetyp_kurzbz === 'qualgate2') {
|
||||
this.serienTermin.kurzbz = newVal.bezeichnung
|
||||
}
|
||||
|
||||
this.serienTermin.upload_allowed = newVal.upload_allowed_default
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
getAllowedAbgabeTypeOptions() {
|
||||
@@ -524,7 +530,7 @@ export const AbgabetoolMitarbeiter = {
|
||||
<div class="col-12 col-md-9"
|
||||
v-if="abgabetypenBetreuer && abgabeTypeOptions"
|
||||
>
|
||||
<Dropdown
|
||||
<Dropdown
|
||||
:style="{'width': '100%'}"
|
||||
v-model="serienTermin.bezeichnung"
|
||||
:options="getAllowedAbgabeTypeOptions"
|
||||
|
||||
@@ -45072,6 +45072,26 @@ array(
|
||||
)
|
||||
)
|
||||
),
|
||||
array(
|
||||
'app' => 'core',
|
||||
'category' => 'abgabetool',
|
||||
'phrase' => 'confirmZusatzdatenSpeichern',
|
||||
'insertvon' => 'system',
|
||||
'phrases' => array(
|
||||
array(
|
||||
'sprache' => 'German',
|
||||
'text' => "Möchten Sie die Zusatzdaten speichern?",
|
||||
'description' => '',
|
||||
'insertvon' => 'system'
|
||||
),
|
||||
array(
|
||||
'sprache' => 'English',
|
||||
'text' => 'Do you want to save the additional data?',
|
||||
'description' => '',
|
||||
'insertvon' => 'system'
|
||||
)
|
||||
)
|
||||
),
|
||||
array(
|
||||
'app' => 'core',
|
||||
'category' => 'abgabetool',
|
||||
|
||||
Reference in New Issue
Block a user