diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php index cbd34a561..2e72041ff 100644 --- a/application/controllers/jobs/AntragJob.php +++ b/application/controllers/jobs/AntragJob.php @@ -349,6 +349,7 @@ class AntragJob extends JOB_Controller $this->StudierendenantragModel->addSelect('prestudent_id'); $this->StudierendenantragModel->addSelect('studiensemester_kurzbz'); $this->StudierendenantragModel->addSelect('s.insertamum'); + $this->StudierendenantragModel->addSelect('s.insertvon'); $this->StudierendenantragModel->db->where_in('public.get_rolle_prestudent(prestudent_id, studiensemester_kurzbz)', $this->config->item('antrag_prestudentstatus_whitelist')); @@ -372,9 +373,11 @@ class AntragJob extends JOB_Controller $result = $this->prestudentlib->setAbbrecher( $antrag->prestudent_id, $antrag->studiensemester_kurzbz, - $insertvon, + 'AntragJob', 'abbrecherStgl', - $antrag->insertamum + $antrag->insertamum, + null, + $antrag->insertvon ?: $insertvon ); if (isError($result)) $this->logError(getError($result)); @@ -413,7 +416,7 @@ class AntragJob extends JOB_Controller } } } - $this->logInfo($count . " Students set to Abbrecher"); + $this->logInfo($count . "/" . count($antraege) . " Students set to Abbrecher"); } $this->logInfo('Ende Job handleAbmeldungenStglDeadline'); } diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php index dcc38acc7..f3eb4d152 100644 --- a/application/libraries/AntragLib.php +++ b/application/libraries/AntragLib.php @@ -854,14 +854,18 @@ class AntragLib $prestudent_status = current($res); $email = $prestudent_status->email; // NOTE(chris): Sancho mail + $lvzuweisungLink = site_url('lehre/Antrag/Wiederholung/assistenz/' . $antrag_id); + if( defined('VILESCI_ROOT') ) + { + $lvzuweisungLink = VILESCI_ROOT . 'index.ci.php/lehre/Antrag/Wiederholung/assistenz/' . $antrag_id; + } sendSanchoMail( 'Sancho_Mail_Antrag_W_New', [ 'antrag_id' => $antrag_id, 'stg' => $prestudent_status->stg_bezeichnung, 'Orgform' => $prestudent_status->orgform, - 'lvzuweisungLink' => site_url('lehre/Antrag/Wiederholung/assistenz/' . $antrag_id), - 'lvzuweisungLinkCIS' => CIS_ROOT . 'index.ci.php/lehre/Antrag/Wiederholung/assistenz/' . $antrag_id + 'lvzuweisungLink' => $lvzuweisungLink ], $email, $this->_ci->p->t('studierendenantrag', 'mail_subject_W_New') diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php index 279b6ed2a..989e14585 100644 --- a/application/libraries/PrestudentLib.php +++ b/application/libraries/PrestudentLib.php @@ -35,10 +35,12 @@ class PrestudentLib $this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel'); } - public function setAbbrecher($prestudent_id, $studiensemester_kurzbz, $insertvon = null, $statusgrund_kurzbz = null, $datum = null, $bestaetigtam = null) + public function setAbbrecher($prestudent_id, $studiensemester_kurzbz, $insertvon = null, $statusgrund_kurzbz = null, $datum = null, $bestaetigtam = null, $bestaetigtvon = null) { if (!$insertvon) $insertvon = getAuthUID(); + if (!$bestaetigtvon) + $bestaetigtvon = $insertvon; $result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz); if (isError($result)) @@ -79,7 +81,7 @@ class PrestudentLib 'insertamum' => date('c'), 'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz, 'studienplan_id'=> $prestudent_status->studienplan_id, - 'bestaetigtvon' => $insertvon, + 'bestaetigtvon' => $bestaetigtvon, 'bestaetigtam' => $bestaetigtam ]); diff --git a/application/models/education/Pruefung_model.php b/application/models/education/Pruefung_model.php index ef7cfc967..e1d668293 100644 --- a/application/models/education/Pruefung_model.php +++ b/application/models/education/Pruefung_model.php @@ -222,9 +222,9 @@ class Pruefung_model extends DB_Model $this->withDetailsForStudierendenAntrag(); if ($maxDate) - $this->db->where("p.datum < ", $maxDate->format('c')); + $this->db->where("p.datum <= ", $maxDate->format('Y-m-d')); if ($minDate) - $this->db->where("p.datum > ", $minDate->format('c')); + $this->db->where("p.datum > ", $minDate->format('Y-m-d')); $this->db->where("b.aktiv", true); diff --git a/application/views/lehre/Antrag/Create.php b/application/views/lehre/Antrag/Create.php index 643991191..2c9d0d382 100644 --- a/application/views/lehre/Antrag/Create.php +++ b/application/views/lehre/Antrag/Create.php @@ -35,13 +35,13 @@ $this->load->view( antrag-type="" studierendenantrag-id="" v-model:info-array="infoArray" - v-model:status-msg="statusMsg" - v-model:status-severity="statusSeverity" + v-model:status-msg="status.msg" + v-model:status-severity="status.severity" >
- +
diff --git a/application/views/lehre/Antrag/Student/List.php b/application/views/lehre/Antrag/Student/List.php index 0bc4c401a..4ca99f951 100644 --- a/application/views/lehre/Antrag/Student/List.php +++ b/application/views/lehre/Antrag/Student/List.php @@ -82,7 +82,7 @@ $this->load->view(
- 
grund; ?>
+
diff --git a/cis/private/lehre/abgabe_lektor_zusatz.php b/cis/private/lehre/abgabe_lektor_zusatz.php index 39488b6c3..b764fd556 100644 --- a/cis/private/lehre/abgabe_lektor_zusatz.php +++ b/cis/private/lehre/abgabe_lektor_zusatz.php @@ -121,15 +121,15 @@ echo ' - '.$p->t('abgabetool/kontrollierteSchlagwoerter').':* + '.$p->t('abgabetool/kontrollierteSchlagwoerter').': - '.$p->t('abgabetool/deutscheSchlagwoerter').': + '.$p->t('abgabetool/deutscheSchlagwoerter').':* - '.$p->t('abgabetool/englischeSchlagwoerter').': + '.$p->t('abgabetool/englischeSchlagwoerter').':* diff --git a/cis/private/lehre/abgabe_student_details.php b/cis/private/lehre/abgabe_student_details.php index 6575dcf70..9171a978c 100644 --- a/cis/private/lehre/abgabe_student_details.php +++ b/cis/private/lehre/abgabe_student_details.php @@ -64,7 +64,6 @@ if(!isset($_POST['uid'])) $fixtermin = false; $datum = '01.01.1980'; $kurzbz = ''; - $kontrollschlagwoerter = ''; $schlagwoerter = ''; $schlagwoerter_en = ''; $abstract = ''; @@ -88,7 +87,6 @@ else $kurzbz = (isset($_POST['kurzbz'])?$_POST['kurzbz']:''); $betreuer = (isset($_POST['betreuer'])?$_POST['betreuer']:'-1'); $sprache = (isset($_POST['sprache'])?$_POST['sprache']:'German'); - $kontrollschlagwoerter = (isset($_POST['kontrollschlagwoerter'])?$_POST['kontrollschlagwoerter']:'-1'); $schlagwoerter = (isset($_POST['schlagwoerter'])?$_POST['schlagwoerter']:'-1'); $schlagwoerter_en = (isset($_POST['schlagwoerter_en'])?$_POST['schlagwoerter_en']:'-1'); $abstract = (isset($_POST['abstract'])?$_POST['abstract']:'-1'); @@ -211,23 +209,7 @@ if($command=='add') { //zusätzliche Daten bearbeiten //Check der Eingabedaten - if(strlen($kontrollschlagwoerter)<1) - { - $error=true; - } - if(mb_strlen($kontrollschlagwoerter)>=150) - { - $kontrollschlagwoerter = mb_substr($kontrollschlagwoerter, 0, 146).'...'; - } - if(strlen($abstract)<1) - { - $error=true; - } - if(strlen($abstract_en)<1) - { - $error=true; - } - if($seitenanzahl<1) + if((strlen($schlagwoerter) < 1) || (strlen($schlagwoerter_en) < 1) || (strlen($abstract) < 1) || (strlen($abstract_en) < 1) || ($seitenanzahl < 1)) { $error=true; } @@ -237,7 +219,6 @@ if($command=='add') seitenanzahl = ".$db->db_add_param($seitenanzahl).", abgabedatum = now(), sprache = ".$db->db_add_param($sprache).", - kontrollschlagwoerter = ".$db->db_add_param($kontrollschlagwoerter).", schlagwoerter_en = ".$db->db_add_param($schlagwoerter_en).", schlagwoerter = ".$db->db_add_param($schlagwoerter).", abstract = ".$db->db_add_param($abstract).", @@ -413,12 +394,9 @@ if($command=="update" && $error!=true) $htmlstr .= " \n"; } $htmlstr .= "\n"; - $htmlstr .= ''.$p->t('abgabetool/kontrollierteSchlagwoerter').':* - - '."\n"; - $htmlstr .= ''.$p->t('abgabetool/deutscheSchlagwoerter').': + $htmlstr .= ''.$p->t('abgabetool/deutscheSchlagwoerter').':* '."\n"; - $htmlstr .= ''.$p->t('abgabetool/englischeSchlagwoerter').': + $htmlstr .= ''.$p->t('abgabetool/englischeSchlagwoerter').':* '."\n"; $htmlstr .= ''.$p->t('abgabetool/abstract').' '.$p->t('abgabetool/maxZeichen').':* '."\n"; @@ -657,7 +635,6 @@ if($command!="add") $htmlstr .= ''."\n"; $htmlstr .= ''."\n"; $htmlstr .= ''."\n"; - $htmlstr .= ''."\n"; $htmlstr .= ''."\n"; $htmlstr .= ''."\n"; $htmlstr .= ''."\n"; diff --git a/cis/private/lehre/swd.php b/cis/private/lehre/swd.php deleted file mode 100644 index 248779aac..000000000 --- a/cis/private/lehre/swd.php +++ /dev/null @@ -1,11 +0,0 @@ - diff --git a/public/js/apps/lehre/Antrag.js b/public/js/apps/lehre/Antrag.js index bcb7b37a7..00a5877b3 100644 --- a/public/js/apps/lehre/Antrag.js +++ b/public/js/apps/lehre/Antrag.js @@ -2,6 +2,7 @@ import StudierendenantragAntrag from "../../components/Studierendenantrag/Antrag import StudierendenantragStatus from "../../components/Studierendenantrag/Status.js"; import StudierendenantragInfoblock from "../../components/Studierendenantrag/Infoblock.js"; import VueDatePicker from "../../components/vueDatepicker.js.php"; +import Phrasen from '../../plugin/Phrasen.js'; const app = Vue.createApp({ components: { @@ -12,10 +13,14 @@ const app = Vue.createApp({ }, data() { return { - statusMsg: "", - statusSeverity: "", + status: { + msg: '', + severity: '' + }, infoArray: [] }; } }); -app.mount('#wrapper'); +app + .use(Phrasen) + .mount('#wrapper'); diff --git a/public/js/apps/lehre/Antrag/Leitung.js b/public/js/apps/lehre/Antrag/Leitung.js index 25e4afaa0..637ca3f61 100644 --- a/public/js/apps/lehre/Antrag/Leitung.js +++ b/public/js/apps/lehre/Antrag/Leitung.js @@ -1,8 +1,12 @@ import StudierendenantragLeitung from '../../../components/Studierendenantrag/Leitung.js'; +import Phrasen from '../../../plugin/Phrasen.js'; const app = Vue.createApp({ components: { StudierendenantragLeitung } }); -app.use(primevue.config.default,{zIndex: {overlay: 9999}}).mount('#wrapper'); +app + .use(Phrasen) + .use(primevue.config.default,{zIndex: {overlay: 9999}}) + .mount('#wrapper'); diff --git a/public/js/apps/lehre/Antrag/Lvzuweisung.js b/public/js/apps/lehre/Antrag/Lvzuweisung.js index 836d1168e..78abec5cf 100644 --- a/public/js/apps/lehre/Antrag/Lvzuweisung.js +++ b/public/js/apps/lehre/Antrag/Lvzuweisung.js @@ -1,4 +1,5 @@ import LvZuweisung from '../../../components/Studierendenantrag/Lvzuweisung.js'; +import Phrasen from '../../../plugin/Phrasen.js'; const app = Vue.createApp({ components: { @@ -10,4 +11,6 @@ const app = Vue.createApp({ } } }); -app.mount('#wrapper'); +app + .use(Phrasen) + .mount('#wrapper'); diff --git a/public/js/apps/lehre/Antrag/Student.js b/public/js/apps/lehre/Antrag/Student.js index f06143149..80cea89e9 100644 --- a/public/js/apps/lehre/Antrag/Student.js +++ b/public/js/apps/lehre/Antrag/Student.js @@ -1,8 +1,11 @@ import LvPopup from '../../../components/Studierendenantrag/Leitung/LvPopup.js'; +import Phrasen from '../../../plugin/Phrasen.js'; const app = Vue.createApp({ components: { LvPopup } }); -app.mount('#wrapper'); +app + .use(Phrasen) + .mount('#wrapper'); diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js index 90cec2d50..453cc0b48 100644 --- a/public/js/components/Bootstrap/Modal.js +++ b/public/js/components/Bootstrap/Modal.js @@ -1,3 +1,5 @@ +import Phrasen from '../../plugin/Phrasen.js'; + export default { data: () => ({ modal: null @@ -86,6 +88,7 @@ export default { } }); const wrapper = document.createElement("div"); + instance.use(Phrasen); // TODO(chris): find a more dynamic way instance.mount(wrapper); document.body.appendChild(wrapper); }); diff --git a/public/js/components/Studierendenantrag/Antrag.js b/public/js/components/Studierendenantrag/Antrag.js index d5989b521..197fe2206 100644 --- a/public/js/components/Studierendenantrag/Antrag.js +++ b/public/js/components/Studierendenantrag/Antrag.js @@ -2,7 +2,6 @@ import StudierendenantragAbmeldung from './Form/Abmeldung.js'; import StudierendenantragAbmeldungStgl from './Form/AbmeldungStgl.js'; import StudierendenantragUnterbrechung from './Form/Unterbrechung.js'; import StudierendenantragWiederholung from './Form/Wiederholung.js'; -import Phrasen from '../../mixins/Phrasen.js'; export default { components: { @@ -11,9 +10,6 @@ export default { StudierendenantragUnterbrechung, StudierendenantragWiederholung }, - mixins: [ - Phrasen - ], emits: [ 'update:infoArray', 'update:statusMsg', @@ -37,13 +33,13 @@ export default { return 'Studierendenantrag' + this.antragType; }, infoText() { - return this.p.t('studierendenantrag/info_' + this.antragType + '_' + this.status); + return this.$p.t('studierendenantrag/info_' + this.antragType + '_' + this.status); } }, template: `
- {{p.t('studierendenantrag', 'title_' + antragType)}} + {{$p.t('studierendenantrag', 'title_' + antragType)}}
diff --git a/public/js/components/Studierendenantrag/Form/Abmeldung.js b/public/js/components/Studierendenantrag/Form/Abmeldung.js index ba6a054ad..513b8b542 100644 --- a/public/js/components/Studierendenantrag/Form/Abmeldung.js +++ b/public/js/components/Studierendenantrag/Form/Abmeldung.js @@ -1,5 +1,4 @@ import {CoreFetchCmpt} from '../../Fetch.js'; -import Phrasen from '../../../mixins/Phrasen.js'; var _uuid = 0; @@ -7,9 +6,6 @@ export default { components: { CoreFetchCmpt }, - mixins: [ - Phrasen - ], emits: [ 'setInfos', 'setStatus' @@ -56,7 +52,7 @@ export default { this.data = result.data.retval; if (this.data.status) { this.$emit("setStatus", { - msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}), + msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})), severity: this.statusSeverity }); } @@ -67,7 +63,7 @@ export default { createAntrag() { bootstrap.Modal.getOrCreateInstance(this.$refs.modal).hide(); this.$emit('setStatus', { - msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_saving')}), + msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_saving')})), severity: 'warning' }); this.saving = true; @@ -93,7 +89,7 @@ export default { this.errors.default.push(result.data.retval[k]); } this.$emit('setStatus', { - msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_error')}), + msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')})), severity: 'danger' }); } @@ -104,13 +100,13 @@ export default { this.data = result.data.retval; if (this.data.status) { this.$emit("setStatus", { - msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}), + msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})), severity: this.statusSeverity }); } else this.$emit('setStatus', { - msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_open')}), + msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_open')})), severity:'success' }); } @@ -120,7 +116,7 @@ export default { }, cancelAntrag() { this.$emit('setStatus', { - msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_cancelling')}), + msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_cancelling')})), severity: 'warning' }); this.saving = true; @@ -144,7 +140,7 @@ export default { this.errors.default.push(result.data.retval[k]); } this.$emit('setStatus', { - msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_error')}), + msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')})), severity:'danger' }); } @@ -156,13 +152,13 @@ export default { this.data = result.data.retval; if (this.data.status) { this.$emit("setStatus", { - msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}), + msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})), severity: this.statusSeverity }); } else this.$emit('setStatus', { - msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_cancelled')}), + msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_cancelled')})), severity: 'danger' }); } @@ -183,37 +179,37 @@ export default {
- + - + - + - + - + - + - +
{{p.t('lehre', 'studiengang')}}{{$p.t('lehre', 'studiengang')}} {{data.bezeichnung}}
{{p.t('lehre', 'organisationsform')}}{{$p.t('lehre', 'organisationsform')}} {{data.orgform_bezeichnung}}
{{p.t('projektarbeitsbeurteilung', 'nameStudierende')}}{{$p.t('projektarbeitsbeurteilung', 'nameStudierende')}} {{data.name}}
{{p.t('person', 'personenkennzeichen')}}{{$p.t('person', 'personenkennzeichen')}} {{data.matrikelnr}}
{{p.t('lehre', 'studienjahr')}}{{$p.t('lehre', 'studienjahr')}} {{data.studienjahr_kurzbz}}
{{p.t('lehre', 'studiensemester')}}{{$p.t('lehre', 'studiensemester')}} {{data.studiensemester_kurzbz}}
{{p.t('lehre', 'semester')}}{{$p.t('lehre', 'semester')}} {{data.semester}}
-
{{p.t('studierendenantrag', 'antrag_grund')}}:
+
{{$p.t('studierendenantrag', 'antrag_grund')}}:
{{data.grund}}
@@ -239,7 +235,7 @@ export default { @click="cancelAntrag" :disabled="saving" > - {{p.t('studierendenantrag', 'btn_cancel')}} + {{$p.t('studierendenantrag', 'btn_cancel')}}
- {{p.t('studierendenantrag', 'title_Abmeldung')}} + {{$p.t('studierendenantrag', 'title_Abmeldung')}} - +
-
+
diff --git a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js index 3524bcd1f..1650d3638 100644 --- a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js +++ b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js @@ -1,5 +1,4 @@ import {CoreFetchCmpt} from '../../Fetch.js'; -import Phrasen from '../../../mixins/Phrasen.js'; var _uuid = 0; @@ -7,9 +6,6 @@ export default { components: { CoreFetchCmpt }, - mixins: [ - Phrasen - ], emits: [ 'setInfos', 'setStatus' @@ -30,7 +26,7 @@ export default { }, computed: { statusSeverity() { - switch (this.data.status) + switch (this.data?.status) { case 'Erstellt': return 'info'; case 'Genehmigt': return 'success'; @@ -56,7 +52,7 @@ export default { this.data = result.data.retval; if (this.data.status) { this.$emit("setStatus", { - msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}), + msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})), severity: this.statusSeverity }); } @@ -67,7 +63,7 @@ export default { createAntrag() { bootstrap.Modal.getOrCreateInstance(this.$refs.modal).hide(); this.$emit('setStatus', { - msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_saving')}), + msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_saving')})), severity: 'warning' }); this.saving = true; @@ -93,7 +89,7 @@ export default { this.errors.default.push(result.data.retval[k]); } this.$emit('setStatus', { - msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_error')}), + msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')})), severity: 'danger' }); } @@ -104,13 +100,13 @@ export default { this.data = result.data.retval; if (this.data.status) { this.$emit("setStatus", { - msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}), + msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})), severity: this.statusSeverity }); } else this.$emit('setStatus', { - msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_open')}), + msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_open')})), severity:'success' }); } @@ -123,7 +119,7 @@ export default { if(event.target.value) { - let templateT= this.p.t('studierendenantrag', event.target.value); + let templateT= this.$p.t('studierendenantrag', event.target.value); templateText.value = templateT; } else @@ -140,40 +136,40 @@ export default {
- + - + - + - + - + - + - +
{{p.t('lehre', 'studiengang')}}{{$p.t('lehre', 'studiengang')}} {{data.bezeichnung}}
{{p.t('lehre', 'organisationsform')}}{{$p.t('lehre', 'organisationsform')}} {{data.orgform_bezeichnung}}
{{p.t('projektarbeitsbeurteilung', 'nameStudierende')}}{{$p.t('projektarbeitsbeurteilung', 'nameStudierende')}} {{data.name}}
{{p.t('person', 'personenkennzeichen')}}{{$p.t('person', 'personenkennzeichen')}} {{data.matrikelnr}}
{{p.t('lehre', 'studienjahr')}}{{$p.t('lehre', 'studienjahr')}} {{data.studienjahr_kurzbz}}
{{p.t('lehre', 'studiensemester')}}{{$p.t('lehre', 'studiensemester')}} {{data.studiensemester_kurzbz}}
{{p.t('lehre', 'semester')}}{{$p.t('lehre', 'semester')}} {{data.semester}}
-
{{p.t('studierendenantrag', 'antrag_grund')}}:
+
{{$p.t('studierendenantrag', 'antrag_grund')}}:
- 
{{data.grund}}
+ 
{{data?.grund}}
@@ -181,18 +177,20 @@ export default {
@@ -316,14 +312,14 @@ export default {
- {{p.t('studierendenantrag', 'antrag_dateianhaenge')}} - {{p.t('studierendenantrag', 'no_attachments')}} + {{$p.t('studierendenantrag', 'antrag_dateianhaenge')}} + {{$p.t('studierendenantrag', 'no_attachments')}}
- {{p.t('studierendenantrag', 'btn_create_Unterbrechung')}} + {{$p.t('studierendenantrag', 'btn_create_Unterbrechung')}}
diff --git a/public/js/components/Studierendenantrag/Form/Wiederholung.js b/public/js/components/Studierendenantrag/Form/Wiederholung.js index 336441dda..c2aea93f2 100644 --- a/public/js/components/Studierendenantrag/Form/Wiederholung.js +++ b/public/js/components/Studierendenantrag/Form/Wiederholung.js @@ -1,6 +1,5 @@ import {CoreFetchCmpt} from '../../Fetch.js'; import VueDatepicker from '../../vueDatepicker.js.php'; -import Phrasen from '../../../mixins/Phrasen.js'; var _uuid = 0; @@ -9,9 +8,6 @@ export default { CoreFetchCmpt, VueDatepicker }, - mixins: [ - Phrasen - ], emits: [ 'setInfos', 'setStatus', @@ -67,11 +63,11 @@ export default { this.data = result.data.retval; if (!this.data.status || this.data.status == 'ErsteAufforderungVersandt' || this.data.status == 'ZweiteAufforderungVersandt') { this.data.status = 'Offen'; - this.data.statustyp = this.p.t('studierendenantrag', 'status_open'); + this.data.statustyp = this.$p.t('studierendenantrag', 'status_open'); } this.$emit('update:status', this.data.status); this.$emit("setStatus", { - msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}), + msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})), severity: this.statusSeverity }); return result; @@ -89,7 +85,7 @@ export default { let nextState = repeat ? 'Erstellt' : 'Verzichtet'; this.$emit('setStatus', { - msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_saving')}), + msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_saving')})), severity: 'warning' }); this.saving = true; @@ -116,7 +112,7 @@ export default { this.errors.default.push(result.data.retval[k]); } this.$emit('setStatus', { - msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_error')}), + msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')})), severity: 'danger' }); } @@ -129,7 +125,7 @@ export default { this.data.status = nextState; this.$emit('update:status', this.data.status); this.$emit("setStatus", { - msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}), + msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})), severity: this.statusSeverity }); } @@ -143,7 +139,7 @@ export default { }, mounted() { this.infos = [...Array(5).keys()].map(n => ({ - body: this.p.t_ref('studierendenantrag', 'infotext_Wiederholung_' + n) + body: Vue.computed(() => this.$p.t('studierendenantrag', 'infotext_Wiederholung_' + n)) })); this.$emit('setInfos', this.infos); }, @@ -156,27 +152,27 @@ export default {
- + - + - + - + - + - +
{{p.t('lehre', 'studiengang')}}{{$p.t('lehre', 'studiengang')}} {{data.bezeichnung}}
{{p.t('lehre', 'organisationsform')}}{{$p.t('lehre', 'organisationsform')}} {{data.orgform_bezeichnung}}
{{p.t('projektarbeitsbeurteilung', 'nameStudierende')}}{{$p.t('projektarbeitsbeurteilung', 'nameStudierende')}} {{data.name}}
{{p.t('person', 'personenkennzeichen')}}{{$p.t('person', 'personenkennzeichen')}} {{data.matrikelnr}}
{{p.t('studierendenantrag', 'antrag_Wiederholung_pruefung')}}{{$p.t('studierendenantrag', 'antrag_Wiederholung_pruefung')}} {{data.lvbezeichnung}}
{{p.t('studierendenantrag', 'antrag_Wiederholung_pruefung_date')}}{{$p.t('studierendenantrag', 'antrag_Wiederholung_pruefung_date')}} {{datumPruefungFormatted}}
@@ -190,7 +186,7 @@ export default { @click="createAntrag" :disabled="saving" > - {{p.t('studierendenantrag/antrag_Wiederholung_button_yes')}} + {{$p.t('studierendenantrag/antrag_Wiederholung_button_yes')}} diff --git a/public/js/components/Studierendenantrag/Leitung.js b/public/js/components/Studierendenantrag/Leitung.js index 611d01b7a..95828e6cb 100644 --- a/public/js/components/Studierendenantrag/Leitung.js +++ b/public/js/components/Studierendenantrag/Leitung.js @@ -5,7 +5,6 @@ import GrundPopup from './Leitung/GrundPopup.js'; import LvPopup from './Leitung/LvPopup.js'; import BsAlert from '../Bootstrap/Alert.js'; import FhcLoader from '../Loader.js'; -import Phrasen from '../../mixins/Phrasen.js'; export default { components: { @@ -14,7 +13,6 @@ export default { LeitungActions, FhcLoader }, - mixins: [Phrasen], props: { stgL: Array, stgA: Array @@ -79,7 +77,7 @@ export default { { let countAntrage = 0; LvPopup - .popup(this.p.t('studierendenantrag','title_show_lvs', currentAntrag), { + .popup(this.$p.t('studierendenantrag','title_show_lvs', currentAntrag), { antragId: currentAntrag.studierendenantrag_id, footer: true, dialogClass: 'modal-lg', @@ -128,7 +126,7 @@ export default { var currentAntrag = antraege.pop(); if (currentAntrag) { GrundPopup - .popup(this.p.t('studierendenantrag', 'title_grund', {id: currentAntrag.studierendenantrag_id}), { + .popup(this.$p.t('studierendenantrag', 'title_grund', {id: currentAntrag.studierendenantrag_id}), { countRemaining: antraege.length }) .then(result => { @@ -211,7 +209,7 @@ export default { var currentAntrag = antraege.pop(); if (currentAntrag) { GrundPopup - .popup(this.p.t('studierendenantrag', 'title_grund', {id: currentAntrag.studierendenantrag_id}), { + .popup(this.$p.t('studierendenantrag', 'title_grund', {id: currentAntrag.studierendenantrag_id}), { countRemaining : antraege.length, optional: true }) diff --git a/public/js/components/Studierendenantrag/Leitung/Actions.js b/public/js/components/Studierendenantrag/Leitung/Actions.js index 71ada5c20..2720a7df5 100644 --- a/public/js/components/Studierendenantrag/Leitung/Actions.js +++ b/public/js/components/Studierendenantrag/Leitung/Actions.js @@ -1,13 +1,11 @@ import ActionsNew from './Actions/New.js'; import ActionsColumns from './Actions/Columns.js'; -import Phrasen from '../../../mixins/Phrasen.js'; export default { components: { ActionsNew, ActionsColumns }, - mixins: [Phrasen], props: { selectedData: Array, columns: Array, @@ -67,17 +65,17 @@ export default {
- - {{p.t('table', 'with_selected', {count: selectedData.length})}} - - - + {{$p.t('table', 'with_selected', {count: selectedData.length})}} + + +
- - + +
diff --git a/public/js/components/Studierendenantrag/Leitung/Actions/Columns.js b/public/js/components/Studierendenantrag/Leitung/Actions/Columns.js index 7128761d7..55a7bd1cc 100644 --- a/public/js/components/Studierendenantrag/Leitung/Actions/Columns.js +++ b/public/js/components/Studierendenantrag/Leitung/Actions/Columns.js @@ -6,9 +6,6 @@ export default { toggleColumn(col) { col.visible = !col.visible; col.original.toggle() - }, - show() { - } }, template: ` diff --git a/public/js/components/Studierendenantrag/Leitung/Actions/New.js b/public/js/components/Studierendenantrag/Leitung/Actions/New.js index ad3009bdb..8952c4e78 100644 --- a/public/js/components/Studierendenantrag/Leitung/Actions/New.js +++ b/public/js/components/Studierendenantrag/Leitung/Actions/New.js @@ -1,15 +1,11 @@ import BsAlert from '../../../Bootstrap/Alert.js'; import BsModal from '../../../Bootstrap/Modal.js'; -import Phrasen from '../../../../mixins/Phrasen.js'; export default { components: { BsModal, AutoComplete: primevue.autocomplete }, - mixins: [ - Phrasen - ], emits: [ 'reload' ], @@ -33,7 +29,7 @@ export default { class: 'position-absolute top-0 start-0 w-100 h-100' }), { dialogClass: 'modal-fullscreen' - }, this.p.t('studierendenantrag', 'antrag_header')).then(() => { + }, this.$p.t('studierendenantrag', 'antrag_header')).then(() => { this.$emit('reload'); this.student = ''; }); @@ -67,17 +63,17 @@ export default {