Compare commits

...
5 changed files with 89 additions and 4 deletions
+3
View File
@@ -74,6 +74,9 @@ $config['tabs'] =
],
],
],
'hiddenFields' => [
'uhrzeit'
]
],
'exemptions' => [
//if true, Anrechnungen can be added and edited in tab Anrechnungen
@@ -280,6 +280,47 @@ class LvMenu extends FHCAPI_Controller
},
$params
);
if (intval(substr($studiensemester_kurzbz, -2)) > 25 && $studiensemester_kurzbz !== "SS2026") {
$menu = array_filter(
$menu,
function ($menuItem) {
return $menuItem['id'] !== 'addon_lvevaluierung_menu_lvevaluierung';
}
);
} else if (intval(substr($studiensemester_kurzbz, -2)) < 25) {
$menu = array_filter(
$menu,
function ($menuItem) {
return $menuItem['id'] !== 'extension_lvevaluierung_menu_initiierung';
}
);
} else {
$oldEval = current(array_filter(
$menu,
function ($menuItem) {
return $menuItem['id'] === 'addon_lvevaluierung_menu_lvevaluierung';
}
));
$newEval = current(array_filter(
$menu,
function ($menuItem) {
return $menuItem['id'] === 'extension_lvevaluierung_menu_initiierung';
}
));
if ($oldEval && $newEval) {
$this->load->library('PhrasesLib');
$p = $this->p;
$menu = array_map(
function ($menuItem) use ($p) {
if ($menuItem['id'] === 'addon_lvevaluierung_menu_lvevaluierung') {
$menuItem['name'] .= ' (' . $p->t('global', 'old') . ')';
}
return $menuItem;
},
$menu
);
}
}
// Menu sortieren
// ##########################################################################################
@@ -315,6 +315,7 @@ class Abschlusspruefung extends FHCAPI_Controller
'abschlussbeurteilung_kurzbz' => $formData['abschlussbeurteilung_kurzbz'],
'datum' => $formData['datum'], //TODO(Manu) check if minute format like FAS
'sponsion' => $formData['sponsion'],
'uhrzeit' => $formData['uhrzeit'],
'pruefer1' => $formData['pruefer1'],
'pruefer2' => $formData['pruefer2'],
'pruefer3' => $formData['pruefer3'],
@@ -387,6 +388,7 @@ class Abschlusspruefung extends FHCAPI_Controller
'abschlussbeurteilung_kurzbz' => $formData['abschlussbeurteilung_kurzbz'],
'datum' => $datum,
'sponsion' => $sponsion,
'uhrzeit' => $formData['uhrzeit'],
'pruefer1' => $pruefer1,
'pruefer2' => $pruefer2,
'pruefer3' => $pruefer3,
@@ -56,7 +56,8 @@ export default {
anmerkung: null,
protokoll: null,
note: null,
link: null
link: null,
uhrzeit: null
},
statusNew: true,
arrTypen: [],
@@ -310,6 +311,7 @@ export default {
this.formData.pruefungstyp_kurzbz = data.pruefungstyp_kurzbz;
this.formData.datum = data.datum;
this.formData.uhrzeit = data.uhrzeit;
this.formData.sponsion = data.sponsion;
this.formData.akadgrad_id = data.akadgrad_id;
this.formData.pruefungsantritt_kurzbz = data.pruefungsantritt_kurzbz;
@@ -411,6 +413,7 @@ export default {
pruefer3_label: this.selectedPruefer3?.label || null,
akadgrad_id: this.formData.akadgrad_id,
datum: this.formData.datum,
uhrzeit: this.formData.uhrzeit || null,
sponsion: this.formData.sponsion
};
localStorage.setItem(STORAGE_KEY, JSON.stringify(stored));
@@ -527,6 +530,7 @@ export default {
this.formData.abschlussbeurteilung_kurzbz = null;
this.formData.datum = null;
this.formData.sponsion = null;
this.formData.uhrzeit = null;
this.formData.pruefer1 = null;
this.formData.pruefer2 = null;
this.formData.pruefer3 = null;
@@ -620,7 +624,7 @@ export default {
);
}
});
},
}
},
created() {
this.$api
@@ -715,7 +719,6 @@ export default {
</template>
<form-form ref="formFinalExam" @submit.prevent>
<legend>{{this.$p.t('global','details')}}</legend>
<p v-if="statusNew">[{{$p.t('ui', 'neu')}}]</p>
@@ -916,6 +919,22 @@ export default {
</form-input>
</div>
<div v-if="!config.hiddenFields?.includes('uhrzeit')" class="row mb-3">
<form-input
container-class="col-6 stv-details-uhrzeit"
:label="$p.t('global', 'uhrzeit')"
type="DatePicker"
v-model="formData.uhrzeit"
model-type="HH:mm:ss"
time-picker
text-input
name="uhrzeit"
:teleport="true"
:cancel-text="$p.t('ui', 'abbrechen')"
:select-text="$p.t('ui', 'ok')"
/>
</div>
<div class="row mb-3">
<form-input
container-class="col-6 stv-details-abschlusspruefung-sponsion"
@@ -979,7 +998,7 @@ export default {
:cisRoot="cisRoot"
@linkGenerated="printDocument"
></abschlusspruefung-dropdown>
</Teleport>
</Teleport>
</div>
`
}
+20
View File
@@ -68199,6 +68199,26 @@ I have been informed that I am under no obligation to consent to the transmissio
)
),
// Zeitsperren Sancho Subjects end
array(
'app' => 'core',
'category' => 'global',
'phrase' => 'old',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'alt',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'old',
'description' => '',
'insertvon' => 'system'
)
)
),
);