Cleanup & Code Identation

This commit is contained in:
cgfhtw
2024-06-26 08:50:26 +02:00
parent 10cd655b67
commit ac04629f86
3 changed files with 322 additions and 335 deletions
@@ -1,4 +1,3 @@
import {CoreRESTClient} from '../../../../RESTClient.js';
import CoreForm from '../../../Form/Form.js';
import FormInput from '../../../Form/Input.js';
import FormUploadImage from '../../../Form/Upload/Image.js';
@@ -1,11 +1,9 @@
import {CoreRESTClient} from '../../../../RESTClient.js';
import FormForm from '../../../Form/Form.js';
import FormInput from '../../../Form/Input.js';
import TblHistory from "./Prestudent/History.js";
export default {
components: {
CoreRESTClient,
FormForm,
FormInput,
TblHistory
@@ -174,351 +172,341 @@ export default {
.catch(this.$fhcAlert.handleSystemError);
},
template: `
<div class="stv-details-prestudent h-100 pb-3">
<div class="stv-details-prestudent h-100 pb-3">
<form-form ref="form" class="stv-details-prestudent" @submit.prevent="updatePrestudent">
<div class="position-sticky top-0 z-1">
<button type="submit" class="btn btn-primary position-absolute top-0 end-0" :disabled="!deltaLength">Speichern</button>
</div>
<div class="position-sticky top-0 z-1">
<button type="submit" class="btn btn-primary position-absolute top-0 end-0" :disabled="!deltaLength">Speichern</button>
</div>
<fieldset>
<legend>{{$p.t('lehre', 'title_zgv')}} {{modelValue.nachname}} {{modelValue.vorname}}</legend>
<div class="row mb-3">
<form-input
container-class="col-3"
label="Prestudent_id"
type="text"
v-model="data.prestudent_id"
name="prestudent_id"
readonly
>
</form-input>
<form-input
container-class="col-3"
label="Person_id"
type="text"
v-model="data.person_id"
name="person_id"
readonly
>
</form-input>
</div>
<div class="row mb-3">
<form-input
container-class="col-3"
label="ZGV"
type="select"
v-model="data.zgv_code"
name="zgvcode"
>
<option v-for="zgv in listZgvs" :key="zgv.zgv_code" :value="zgv.zgv_code">{{zgv.zgv_bez}}</option>
</form-input>
<form-input
container-class="col-3"
:label="$p.t('infocenter', 'zgvOrt')"
type="text"
v-model="data.zgvort"
name="zgvort"
>
</form-input>
<form-input
container-class="col-3"
:label="$p.t('infocenter', 'zgvDatum')"
type="DatePicker"
v-model="data.zgvdatum"
name="zgvdatum"
no-today
auto-apply
:enable-time-picker="false"
format="dd.MM.yyyy"
preview-format="dd.MM.yyyy"
:teleport="true"
>
</form-input>
<form-input
container-class="col-3"
:label="$p.t('infocenter', 'zgvNation')"
type="select"
v-model="data.zgvnation"
name="zgvnation"
>
<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
</form-input>
</div>
<div class="row mb-3">
<form-input
container-class="col-3"
:label="$p.t('lehre', 'zgvMaster')"
type="select"
v-model="data.zgvmas_code"
name="zgvmascode"
>
<option v-for="mzgv in listZgvsmaster" :key="mzgv.zgvmas_code" :value="mzgv.zgvmas_code">{{mzgv.zgvmas_bez}}</option>
</form-input>
<form-input
container-class="col-3"
:label="$p.t('lehre', 'zgvMasterOrt')"
type="text"
v-model="data.zgvmaort"
name="zgvmaort"
>
</form-input>
<form-input
container-class="col-3"
:label="$p.t('lehre', 'zgvMasterDatum')"
type="DatePicker"
v-model="data.zgvmadatum"
name="zgvmadatum"
no-today
auto-apply
:enable-time-picker="false"
format="dd.MM.yyyy"
preview-format="dd.MM.yyyy"
:teleport="true"
>
</form-input>
<form-input
container-class="col-3"
:label="$p.t('lehre', 'zgvMasterNation')"
type="select"
v-model="data.zgvmanation"
name="zgvmanation"
>
<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
</form-input>
</div>
<!--ZGV Doktor-->
<div v-if="showZgvDoktor" class="row mb-3">
<form-input
container-class="col-3"
:label="$p.t('lehre', 'zgvDoktor')"
type="select"
v-model="data.zgvdoktor_code"
name="zgvdoktor_code"
>
<option v-for="zgv in listZgvsdoktor" :key="zgv.zgvdoktor_code" :value="zgv.zgvdoktor_code">{{zgv.zgvdoktor_bez}}</option>
</form-input>
<form-input
container-class="col-3"
:label="$p.t('lehre', 'zgvDoktorOrt')"
type="text"
v-model="data.zgvdoktorort"
name="zgvdoktorort"
>
</form-input>
<form-input
container-class="col-3"
:label="$p.t('lehre', 'zgvDoktorDatum')"
type="DatePicker"
v-model="data.zgvdoktordatum"
name="zgvdoktordatum"
no-today
auto-apply
:enable-time-picker="false"
format="dd.MM.yyyy"
preview-format="dd.MM.yyyy"
:teleport="true"
>
</form-input>
<form-input
container-class="col-3"
:label="$p.t('lehre', 'zgvDoktorNation')"
type="select"
v-model="data.zgvdoktornation"
name="zgvdoktornation"
>
<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
</form-input>
</div>
<div v-if="showZgvErfuellt" class="row mb-3">
<div class="col-3 pt-4 d-flex align-items-center">
<form-input
container-class="form-check"
:label="$p.t('infocenter', 'zgvErfuellt')"
type="checkbox"
v-model="data.zgv_erfuellt"
name="zgv_erfuellt"
>
</form-input>
</div>
<div class="col-3 pt-4 d-flex align-items-center">
<form-input
container-class="form-check"
:label="$p.t('infocenter', 'zgvMasterErfuellt')"
type="checkbox"
v-model="data.zgvmas_erfuellt"
name="zgvmas_erfuellt"
>
</form-input>
</div>
<div v-if="showZgvDoktor" class="col-3 pt-4 d-flex align-items-center">
<form-input
container-class="form-check"
:label="$p.t('infocenter', 'zgvDoktorErfuellt')"
type="checkbox"
v-model="data.zgvdoktor_erfuellt"
name="zgvdoktor_erfuellt"
>
</form-input>
</div>
</div>
<!-- </template>-->
<div class="row mb-3">
<form-input
container-class="col-3"
label="Prestudent_id"
type="text"
v-model="data.prestudent_id"
name="prestudent_id"
readonly
>
</form-input>
<form-input
container-class="col-3"
label="Person_id"
type="text"
v-model="data.person_id"
name="person_id"
readonly
>
</form-input>
</div>
<div class="row mb-3">
<form-input
container-class="col-3"
label="ZGV"
type="select"
v-model="data.zgv_code"
name="zgvcode"
>
<option v-for="zgv in listZgvs" :key="zgv.zgv_code" :value="zgv.zgv_code">{{zgv.zgv_bez}}</option>
</form-input>
<form-input
container-class="col-3"
:label="$p.t('infocenter', 'zgvOrt')"
type="text"
v-model="data.zgvort"
name="zgvort"
>
</form-input>
<form-input
container-class="col-3"
:label="$p.t('infocenter', 'zgvDatum')"
type="DatePicker"
v-model="data.zgvdatum"
name="zgvdatum"
no-today
auto-apply
:enable-time-picker="false"
format="dd.MM.yyyy"
preview-format="dd.MM.yyyy"
:teleport="true"
>
</form-input>
<form-input
container-class="col-3"
:label="$p.t('infocenter', 'zgvNation')"
type="select"
v-model="data.zgvnation"
name="zgvnation"
>
<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
</form-input>
</div>
<div class="row mb-3">
<form-input
container-class="col-3"
:label="$p.t('lehre', 'zgvMaster')"
type="select"
v-model="data.zgvmas_code"
name="zgvmascode"
>
<option v-for="mzgv in listZgvsmaster" :key="mzgv.zgvmas_code" :value="mzgv.zgvmas_code">{{mzgv.zgvmas_bez}}</option>
</form-input>
<form-input
container-class="col-3"
:label="$p.t('lehre', 'zgvMasterOrt')"
type="text"
v-model="data.zgvmaort"
name="zgvmaort"
>
</form-input>
<form-input
container-class="col-3"
:label="$p.t('lehre', 'zgvMasterDatum')"
type="DatePicker"
v-model="data.zgvmadatum"
name="zgvmadatum"
no-today
auto-apply
:enable-time-picker="false"
format="dd.MM.yyyy"
preview-format="dd.MM.yyyy"
:teleport="true"
>
</form-input>
<form-input
container-class="col-3"
:label="$p.t('lehre', 'zgvMasterNation')"
type="select"
v-model="data.zgvmanation"
name="zgvmanation"
>
<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
</form-input>
</div>
<!--ZGV Doktor-->
<div v-if="showZgvDoktor" class="row mb-3">
<form-input
container-class="col-3"
:label="$p.t('lehre', 'zgvDoktor')"
type="select"
v-model="data.zgvdoktor_code"
name="zgvdoktor_code"
>
<option v-for="zgv in listZgvsdoktor" :key="zgv.zgvdoktor_code" :value="zgv.zgvdoktor_code">{{zgv.zgvdoktor_bez}}</option>
</form-input>
<form-input
container-class="col-3"
:label="$p.t('lehre', 'zgvDoktorOrt')"
type="text"
v-model="data.zgvdoktorort"
name="zgvdoktorort"
>
</form-input>
<form-input
container-class="col-3"
:label="$p.t('lehre', 'zgvDoktorDatum')"
type="DatePicker"
v-model="data.zgvdoktordatum"
name="zgvdoktordatum"
no-today
auto-apply
:enable-time-picker="false"
format="dd.MM.yyyy"
preview-format="dd.MM.yyyy"
:teleport="true"
>
</form-input>
<form-input
container-class="col-3"
:label="$p.t('lehre', 'zgvDoktorNation')"
type="select"
v-model="data.zgvdoktornation"
name="zgvdoktornation"
>
<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
</form-input>
</div>
<div v-if="showZgvErfuellt" class="row mb-3">
<div class="col-3 pt-4 d-flex align-items-center">
<form-input
container-class="form-check"
:label="$p.t('infocenter', 'zgvErfuellt')"
type="checkbox"
v-model="data.zgv_erfuellt"
name="zgv_erfuellt"
>
</form-input>
</div>
<div class="col-3 pt-4 d-flex align-items-center">
<form-input
container-class="form-check"
:label="$p.t('infocenter', 'zgvMasterErfuellt')"
type="checkbox"
v-model="data.zgvmas_erfuellt"
name="zgvmas_erfuellt"
>
</form-input>
</div>
<div v-if="showZgvDoktor" class="col-3 pt-4 d-flex align-items-center">
<form-input
container-class="form-check"
:label="$p.t('infocenter', 'zgvDoktorErfuellt')"
type="checkbox"
v-model="data.zgvdoktor_erfuellt"
name="zgvdoktor_erfuellt"
>
</form-input>
</div>
</div>
</fieldset>
<fieldset>
<legend>PrestudentIn</legend>
<div class="row mb-3">
<form-input
container-class="col-4"
:label="$p.t('person', 'aufmerksamDurch')"
type="select"
v-model="data.aufmerksamdurch_kurzbz"
name="aufmerksamDurch"
>
<option v-for="adurch in listAufmerksamdurch" :key="adurch.aufmerksamdurch_kurzbz" :value="adurch.aufmerksamdurch_kurzbz">{{adurch.beschreibung}}</option>
</form-input>
<form-input
container-class="col-4"
:label="$p.t('person', 'berufstaetigkeit')"
type="select"
v-model="data.berufstaetigkeit_code"
name="berufstaetigkeit_code"
>
<option v-for="beruf in listBerufe" :key="beruf.berufstaetigkeit_code" :value="beruf.berufstaetigkeit_code">{{beruf.berufstaetigkeit_bez}} </option>
</form-input>
<form-input
container-class="col-4"
:label="$p.t('person', 'ausbildung')"
type="select"
v-model="data.ausbildungcode"
name="ausbildungcode"
>
<option v-for="ausbld in listAusbildung" :key="ausbld.ausbildungcode" :value="ausbld.ausbildungcode">{{ausbld.ausbildungbez}} </option>
</form-input>
</div>
<div class="row mb-3">
<div class="row mb-3">
<form-input
container-class="col-4"
label="Aufnahmeschlüssel"
type="text"
v-model="data.aufnahmeschluessel"
name="aufnahmeschluessel"
disabled
>
</form-input>
<div class="col-4 pt-4 d-flex align-items-center">
<form-input
container-class="col-4"
:label="$p.t('person', 'aufmerksamDurch')"
type="select"
v-model="data.aufmerksamdurch_kurzbz"
name="aufmerksamDurch"
container-class="form-check"
:label="$p.t('person', 'facheinschlaegigBerufstaetig')"
type="checkbox"
v-model="data.facheinschlberuf"
name="facheinschlberuf"
>
<option v-for="adurch in listAufmerksamdurch" :key="adurch.aufmerksamdurch_kurzbz" :value="adurch.aufmerksamdurch_kurzbz">{{adurch.beschreibung}}</option>
</form-input>
<form-input
container-class="col-4"
:label="$p.t('person', 'berufstaetigkeit')"
type="select"
v-model="data.berufstaetigkeit_code"
name="berufstaetigkeit_code"
>
<option v-for="beruf in listBerufe" :key="beruf.berufstaetigkeit_code" :value="beruf.berufstaetigkeit_code">{{beruf.berufstaetigkeit_bez}} </option>
</form-input>
<form-input
container-class="col-4"
:label="$p.t('person', 'ausbildung')"
type="select"
v-model="data.ausbildungcode"
name="ausbildungcode"
>
<option v-for="ausbld in listAusbildung" :key="ausbld.ausbildungcode" :value="ausbld.ausbildungcode">{{ausbld.ausbildungbez}} </option>
</form-input>
</div>
<div class="row mb-3">
<!--Todo(manu) validierung Integer, liste hier null-->
<form-input
container-class="col-4"
:label="$p.t('person', 'bisstandort')"
type="text"
v-model="data.standort_code"
name="standort_code"
disabled
>
</form-input>
</div>
<div class="row mb-3">
<form-input
container-class="col-4"
:label="$p.t('lehre', 'studiengang')"
type="select"
v-model="data.studiengang_kz"
name="studiengang_kz"
disabled
>
<option v-for="stg in listStgs" :key="stg.studiengang_kz" :value="stg.studiengang_kz">{{stg.kuerzel}} - {{stg.bezeichnung}} </option>
</form-input>
<form-input
container-class="col-4"
:label="$p.t('lehre', 'studientyp')"
type="select"
v-model="data.gsstudientyp_kurzbz"
name="gsstudientyp_kurzbz"
>
<option v-for="typ in listStgTyp" :key="typ.typ" :value="typ.typ">{{typ.bezeichnung}} </option>
</form-input>
</div>
<div class="row mb-3">
<form-input
container-class="col-4"
:label="$p.t('global', 'anmerkung')"
type="text"
v-model="data.anmerkung"
name="anmerkung"
>
</form-input>
<div class="col-2 pt-4 d-flex align-items-center">
<form-input
container-class="col-4"
label="Aufnahmeschlüssel"
type="text"
v-model="data.aufnahmeschluessel"
name="aufnahmeschluessel"
disabled
container-class="form-check"
:label="$p.t('person', 'bismelden')"
type="checkbox"
v-model="data.bismelden"
name="bismelden"
>
</form-input>
<div class="col-4 pt-4 d-flex align-items-center">
<form-input
container-class="form-check"
:label="$p.t('person', 'facheinschlaegigBerufstaetig')"
type="checkbox"
v-model="data.facheinschlberuf"
name="facheinschlberuf"
>
</form-input>
</div>
<!--Todo(manu) validierung Integer, liste hier null-->
<form-input
container-class="col-4"
:label="$p.t('person', 'bisstandort')"
type="text"
v-model="data.standort_code"
name="standort_code"
disabled
>
</form-input>
</div>
<div class="row mb-3">
<form-input
container-class="col-4"
:label="$p.t('lehre', 'studiengang')"
type="select"
v-model="data.studiengang_kz"
name="studiengang_kz"
disabled
>
<option v-for="stg in listStgs" :key="stg.studiengang_kz" :value="stg.studiengang_kz">{{stg.kuerzel}} - {{stg.bezeichnung}} </option>
</form-input>
<form-input
container-class="col-4"
:label="$p.t('lehre', 'studientyp')"
type="select"
v-model="data.gsstudientyp_kurzbz"
name="gsstudientyp_kurzbz"
>
<option v-for="typ in listStgTyp" :key="typ.typ" :value="typ.typ">{{typ.bezeichnung}} </option>
</form-input>
</div>
<div class="col-2 pt-4 d-flex align-items-center">
<form-input
container-class="form-check"
:label="$p.t('lehre', 'dual')"
type="checkbox"
v-model="data.dual"
name="dual"
>
</form-input>
</div>
<form-input
container-class="col-3"
:label="$p.t('lehre', 'foerderrelevant')"
type="select"
v-model="data.foerderrelevant"
name="foerderrelevant"
>
<option v-for="entry in listFoerderrelevant" :value="entry.value">{{entry.text}}</option>
</form-input>
<div class="row mb-3">
<form-input
container-class="col-4"
:label="$p.t('global', 'anmerkung')"
type="text"
v-model="data.anmerkung"
name="anmerkung"
>
</form-input>
<div class="col-2 pt-4 d-flex align-items-center">
<form-input
container-class="form-check"
:label="$p.t('person', 'bismelden')"
type="checkbox"
v-model="data.bismelden"
name="bismelden"
>
</form-input>
</div>
<div class="col-2 pt-4 d-flex align-items-center">
<form-input
container-class="form-check"
:label="$p.t('lehre', 'dual')"
type="checkbox"
v-model="data.dual"
name="dual"
>
</form-input>
</div>
<form-input
container-class="col-3"
:label="$p.t('lehre', 'foerderrelevant')"
type="select"
v-model="data.foerderrelevant"
name="foerderrelevant"
>
<option v-for="entry in listFoerderrelevant" :value="entry.value">{{entry.text}}</option>
</form-input>
<form-input
container-class="col-1"
:label="$p.t('lehre', 'prioritaet')"
type="text"
v-model="data.priorisierung"
name="priorisierung"
:disabled="!hasPrestudentPermission"
>
</form-input>
</div>
</fieldset>
<form-input
container-class="col-1"
:label="$p.t('lehre', 'prioritaet')"
type="text"
v-model="data.priorisierung"
name="priorisierung"
:disabled="!hasPrestudentPermission"
>
</form-input>
</div>
</fieldset>
</form-form>
<br>
<div class="col-8">
<legend>Gesamthistorie</legend>
<TblHistory :person_id="modelValue.person_id"></TblHistory>
<tbl-history :person_id="modelValue.person_id"></tbl-history>
</div>
</div>
`
};
@@ -49,14 +49,14 @@ export default{
}
},
template: `
<div class="stv-list h-100 pt-3">
<core-filter-cmpt
ref="table"
:tabulator-options="tabulatorOptions"
:tabulator-events="tabulatorEvents"
table-only
:side-menu="false"
<div class="stv-list h-100 pt-3">
<core-filter-cmpt
ref="table"
:tabulator-options="tabulatorOptions"
:tabulator-events="tabulatorEvents"
table-only
:side-menu="false"
>
</core-filter-cmpt>
</div>`
</div>`
}