diff --git a/application/config/stv.php b/application/config/stv.php index 34a30a96e..639c5d23b 100644 --- a/application/config/stv.php +++ b/application/config/stv.php @@ -60,7 +60,13 @@ $config['tabs'] = ], 'notes' => [ //if true, the count of Messages will be shown in the header of the Tab Messages - 'showCountNotes' => true + 'showCountNotes' => true, + + //if true: section with following fields will be displayed: 'verfasser', 'bearbeiter', 'von', 'bis' and 'erledigt' + 'showErweitert' => false, + + //notizlayout: choose of "classicFas", "twoColumnsFormLeft", twoColumnsFormRight, popupModal" + 'notizLayout' => 'popupModal' ], 'combinePeople' => [ //multitab should only be shown with this length of selection diff --git a/application/controllers/api/frontend/v1/OtherLvPlan.php b/application/controllers/api/frontend/v1/OtherLvPlan.php index cad654f12..af075fbc3 100644 --- a/application/controllers/api/frontend/v1/OtherLvPlan.php +++ b/application/controllers/api/frontend/v1/OtherLvPlan.php @@ -17,60 +17,59 @@ */ if (!defined('BASEPATH')) - exit('No direct script access allowed'); + exit('No direct script access allowed'); class OtherLvPlan extends FHCAPI_Controller { - /** - * Object initialization - */ - public function __construct() - { - parent::__construct([ - 'otherLvPlanViewData' => ['basis/other_lv_plan:r'], - ]); + /** + * Object initialization + */ + public function __construct() + { + parent::__construct([ + 'otherLvPlanViewData' => ['basis/other_lv_plan:r'], + ]); - $this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel'); - $this->load->model('person/Benutzer_model', 'BenutzerModel'); + $this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel'); + $this->load->model('person/Benutzer_model', 'BenutzerModel'); + $this->load->library('ProfilLib'); - } + } - //------------------------------------------------------------------------------------------------------------------ - // Public methods + //------------------------------------------------------------------------------------------------------------------ + // Public methods - /** - * retrieves viewData for other lv plan view - * @access public - * @param $uid the userID for which the other lv plan is being viewed - */ - public function otherLvPlanViewData($uid) - { - $isMitarbeiterResult = $this->MitarbeiterModel->isMitarbeiter($uid); - $isMitarbeiter = getData($isMitarbeiterResult); - $isStudent = !$isMitarbeiter; + /** + * retrieves viewData for other lv plan view + * @access public + * @param $uid the userID for which the other lv plan is being viewed + */ + public function otherLvPlanViewData($uid) + { + $isMitarbeiterResult = $this->MitarbeiterModel->isMitarbeiter($uid); + $isMitarbeiter = getData($isMitarbeiterResult); + $isStudent = !$isMitarbeiter; - $this->BenutzerModel->addSelect(["foto", "vorname", "nachname"]); - $this->BenutzerModel->addJoin("tbl_person", "person_id"); - $personResult = $this->BenutzerModel->load([$uid]); - $person = hasData($personResult) ? getData($personResult) : null; + $resProfileData = $this->profillib->getView($uid); + $profileData = hasData($resProfileData) ? getData($resProfileData) : null; - $viewData = [ - "user_data" => [ - "username" => $uid, - "is_student" => $isStudent, - "is_mitarbeiter" => $isMitarbeiter, - "foto" => $person[0]->foto, - "vorname" => $person[0]->vorname, - "nachname" => $person[0]->nachname, - ], - ]; + $viewData = [ + "user_data" => [ + "username" => $uid, + "is_student" => $isStudent, + "is_mitarbeiter" => $isMitarbeiter, + "foto" => $profileData->data->foto, + "vorname" => $profileData->data->vorname, + "nachname" => $profileData->data->nachname, + ], + ]; - $this->terminateWithSuccess($viewData); - } + $this->terminateWithSuccess($viewData); + } - // ----------------------------------------------------------------------------------------------------------------- - // Private methods + // ----------------------------------------------------------------------------------------------------------------- + // Private methods } diff --git a/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php b/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php index 7486f44f0..0ac3c8bca 100644 --- a/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php +++ b/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php @@ -259,7 +259,7 @@ class BetriebsmittelP extends FHCAPI_Controller $kaution = $this->input->post('kaution'); if($kaution) $kaution = str_replace(',', '.', $kaution); $ausgegebenam = $this->input->post('ausgegebenam'); - $retouram = $this->input->post('retouram'); + $retouram = $this->input->post('retouram') == "" ? null : $this->input->post('retouram'); // NOTE(chris): transform_kartennummer if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer) diff --git a/application/controllers/api/frontend/v1/detailheader/Detailheader.php b/application/controllers/api/frontend/v1/detailheader/Detailheader.php index ada10c5b6..2aacb4cc0 100644 --- a/application/controllers/api/frontend/v1/detailheader/Detailheader.php +++ b/application/controllers/api/frontend/v1/detailheader/Detailheader.php @@ -9,9 +9,9 @@ class Detailheader extends FHCAPI_Controller public function __construct() { parent::__construct([ - 'getHeader' => ['vertrag/mitarbeiter:r'], - 'getPersonAbteilung' => ['vertrag/mitarbeiter:r'], - 'getLeitungOrg' => ['vertrag/mitarbeiter:r'], + 'getHeader' => ['vertrag/mitarbeiter:r', 'basis/mitarbeiter:r'], + 'getPersonAbteilung' => ['vertrag/mitarbeiter:r', 'basis/mitarbeiter:r'], + 'getLeitungOrg' => ['vertrag/mitarbeiter:r', 'basis/mitarbeiter:r'], ]); } diff --git a/application/controllers/api/frontend/v1/funktionen/Funktionen.php b/application/controllers/api/frontend/v1/funktionen/Funktionen.php index b2787072b..a3efcdb51 100644 --- a/application/controllers/api/frontend/v1/funktionen/Funktionen.php +++ b/application/controllers/api/frontend/v1/funktionen/Funktionen.php @@ -294,6 +294,10 @@ class Funktionen extends FHCAPI_Controller { $this->terminateWithValidationErrors($this->form_validation->error_array()); } + if($datum_von == '') + $datum_von = null; + if($datum_bis == '') + $datum_bis = null; $result = $this->BenutzerfunktionModel->update( [ diff --git a/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php b/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php index def4f6502..8f2b1edd6 100644 --- a/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php +++ b/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php @@ -371,6 +371,9 @@ class Abschlusspruefung extends FHCAPI_Controller $this->terminateWithValidationErrors($this->form_validation->error_array()); } + $datum = $formData['datum'] == '' ? null : $formData['datum']; + $sponsion = $formData['sponsion'] == '' ? null : $formData['sponsion']; + $result = $this->AbschlusspruefungModel->update( [ 'abschlusspruefung_id' => $abschlusspruefung_id @@ -382,8 +385,8 @@ class Abschlusspruefung extends FHCAPI_Controller 'vorsitz' => $vorsitz, 'pruefungsantritt_kurzbz' => $formData['pruefungsantritt_kurzbz'], 'abschlussbeurteilung_kurzbz' => $formData['abschlussbeurteilung_kurzbz'], - 'datum' => $formData['datum'], - 'sponsion' => $formData['sponsion'], + 'datum' => $datum, + 'sponsion' => $sponsion, 'pruefer1' => $pruefer1, 'pruefer2' => $pruefer2, 'pruefer3' => $pruefer3, diff --git a/application/controllers/api/frontend/v1/stv/Dokumente.php b/application/controllers/api/frontend/v1/stv/Dokumente.php index 913a57dc4..b47a4af87 100644 --- a/application/controllers/api/frontend/v1/stv/Dokumente.php +++ b/application/controllers/api/frontend/v1/stv/Dokumente.php @@ -170,6 +170,8 @@ class Dokumente extends FHCAPI_Controller $this->terminateWithValidationErrors($this->form_validation->error_array()); } + $nachgereicht_am = $this->input->post('nachgereicht_am') == '' ? null : $this->input->post('nachgereicht_am'); + $uid = getAuthUID(); $result = $this->AkteModel->update( @@ -180,7 +182,7 @@ class Dokumente extends FHCAPI_Controller 'dokument_kurzbz' => $this->input->post('dokument_kurzbz'), 'anmerkung_intern' => $this->input->post('anmerkung_intern'), 'titel_intern' => $this->input->post('titel_intern'), - 'nachgereicht_am' => $this->input->post('nachgereicht_am'), + 'nachgereicht_am' => $nachgereicht_am, 'updateamum' => date('c'), 'updatevon' => $uid, ] diff --git a/application/controllers/api/frontend/v1/stv/Konto.php b/application/controllers/api/frontend/v1/stv/Konto.php index d59bc76b0..2654c18f6 100644 --- a/application/controllers/api/frontend/v1/stv/Konto.php +++ b/application/controllers/api/frontend/v1/stv/Konto.php @@ -429,9 +429,12 @@ class Konto extends FHCAPI_Controller 'updateamum' => date('c'), 'updatevon' => getAuthUID() ]; + foreach ($allowed as $field) if ($this->input->post($field) !== null) $data[$field] = $this->input->post($field); + if($data['buchungsdatum'] == '') + $data['buchungsdatum'] = null; $result = $this->KontoModel->update($id, $data); diff --git a/application/controllers/api/frontend/v1/stv/Mobility.php b/application/controllers/api/frontend/v1/stv/Mobility.php index f61816086..5639da549 100644 --- a/application/controllers/api/frontend/v1/stv/Mobility.php +++ b/application/controllers/api/frontend/v1/stv/Mobility.php @@ -237,8 +237,8 @@ class Mobility extends FHCAPI_Controller } $formData = $this->input->post('formData'); - $von = $formData['von'] ?? null; - $bis = $formData['bis'] ?? null; + $von = ($formData['von'] ?? '') ?: null; + $bis = ($formData['bis'] ?? '') ?: null; $nation_code = $formData['nation_code'] ?? null; $mobilitaetsprogramm_code = $formData['mobilitaetsprogramm_code'] ?? null; $herkunftsland_code = $formData['herkunftsland_code'] ?? null; diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php index d8c8d1ff2..33957872f 100644 --- a/application/controllers/api/frontend/v1/stv/Prestudent.php +++ b/application/controllers/api/frontend/v1/stv/Prestudent.php @@ -193,7 +193,7 @@ class Prestudent extends FHCAPI_Controller } elseif ( $val === '' - && in_array($prop, ['zgvnation', 'zgvmanation', 'zgvdoktornation', 'berufstaetigkeit_code', 'ausbildungcode']) + && in_array($prop, ['zgvnation', 'zgvmanation', 'zgvdoktornation', 'berufstaetigkeit_code', 'ausbildungcode', 'zgvdatum', 'zgvmadatum']) ) { $val = null; diff --git a/application/controllers/api/frontend/v1/stv/Pruefung.php b/application/controllers/api/frontend/v1/stv/Pruefung.php index 4521c2033..becda03ee 100644 --- a/application/controllers/api/frontend/v1/stv/Pruefung.php +++ b/application/controllers/api/frontend/v1/stv/Pruefung.php @@ -448,8 +448,10 @@ class Pruefung extends FHCAPI_Controller } } + $datum = $this->input->post('datum') == '' ? null : $this->input->post('datum'); if(intval($pruefung_id) > 0) { + $result = $this->PruefungModel->update( [ 'pruefung_id' => $pruefung_id @@ -459,7 +461,7 @@ class Pruefung extends FHCAPI_Controller 'mitarbeiter_uid' => $this->input->post('mitarbeiter_uid'), 'note' => $this->input->post('note'), 'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'), - 'datum' => $this->input->post('datum'), + 'datum' => $datum, 'anmerkung' => $this->input->post('anmerkung'), 'updatevon' => $authUID, 'updateamum' => date('c'), @@ -472,7 +474,7 @@ class Pruefung extends FHCAPI_Controller 'lehreinheit_id' => $this->input->post('lehreinheit_id'), 'student_uid' => $this->input->post('student_uid'), 'mitarbeiter_uid' => $this->input->post('mitarbeiter_uid'), - 'datum' => $this->input->post('datum'), + 'datum' => $datum, 'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'), 'note' => $this->input->post('note'), 'anmerkung' => $this->input->post('anmerkung'), @@ -520,7 +522,7 @@ class Pruefung extends FHCAPI_Controller 'studiensemester_kurzbz' => $studiensemester_kurzbz, 'note' => $this->input->post('note'), 'uebernahmedatum' => date('c'), - 'benotungsdatum' => $this->input->post('datum'), + 'benotungsdatum' => $datum, 'insertamum' => date('c'), 'insertvon' => $authUID, 'punkte' => $this->input->post('punkte') ? str_replace(',', '.', $this->input->post('punkte')) : null @@ -555,7 +557,7 @@ class Pruefung extends FHCAPI_Controller ], [ 'note' => $this->input->post('note'), 'uebernahmedatum' => date('c'), - 'benotungsdatum' => $this->input->post('datum'), + 'benotungsdatum' => $datum, 'updateamum' => date('c'), 'updatevon' => $authUID, 'punkte' => $this->input->post('punkte') ? str_replace(',', '.', $this->input->post('punkte')) : null diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php index 7694807e7..55aaef178 100644 --- a/application/controllers/api/frontend/v1/stv/Student.php +++ b/application/controllers/api/frontend/v1/stv/Student.php @@ -296,6 +296,10 @@ class Student extends FHCAPI_Controller $fotoval = ($val == '') ? null : str_replace('data:image/jpeg;base64,', '', $val); $update_person[$prop] = $fotoval; } + else if ($prop == 'gebdatum') + { + $update_person[$prop] = ($val == '') ? null : $val; + } else { $update_person[$prop] = $val; diff --git a/application/libraries/StundenplanLib.php b/application/libraries/StundenplanLib.php index a7bec61ec..1d88ad0db 100644 --- a/application/libraries/StundenplanLib.php +++ b/application/libraries/StundenplanLib.php @@ -80,10 +80,12 @@ class StundenplanLib if (isError($semester_range)) return $semester_range; $semester_range = getData($semester_range); + $this->_ci->addMeta('semester_range', $semester_range); $this->sortStudienSemester($semester_range); $function_error = $this->applyLoadUeberSemesterHaelfte($semester_range); + $this->_ci->addMeta('nach_apply_semester_range', $semester_range); if ($function_error) return $function_error; @@ -784,7 +786,8 @@ class StundenplanLib $this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel'); // gets all studiensemester from the student from start_date to end_date - $semester_range = $this->_ci->StudiensemesterModel->getByDateRange($start_date, $end_date); + //$semester_range = $this->_ci->StudiensemesterModel->getByDateRange($start_date, $end_date); + $semester_range = $this->_ci->StudiensemesterModel->getContainingOrNearestByDateRange($start_date, $end_date); if (isError($semester_range)) return $semester_range; diff --git a/application/models/organisation/Studiensemester_model.php b/application/models/organisation/Studiensemester_model.php index 5fa6ffb14..1b480771f 100644 --- a/application/models/organisation/Studiensemester_model.php +++ b/application/models/organisation/Studiensemester_model.php @@ -122,6 +122,47 @@ class Studiensemester_model extends DB_Model return $this->execQuery($query, array($studiensemester_kurzbz, $limit)); } + + /** + * Returns the current study semester and the previous semesters of the same type (SS/WS). + * + * Example: + * - SS2026, limit 3: SS2026, SS2025, SS2024 + * - WS2025, limit 2: WS2025, WS2024 + * + * @param $studiensemester_kurzbz + * @param $limit + */ + public function getPreviousSameSemesterFrom($studiensemester_kurzbz, $limit = 1) + { + $qry = ' + SELECT + studiensemester_kurzbz, + start, + ende + FROM + public.tbl_studiensemester + WHERE + SUBSTRING(studiensemester_kurzbz FROM 1 FOR 2) = SUBSTRING(? FROM 1 FOR 2) + AND start <= ( + SELECT start + FROM public.tbl_studiensemester + WHERE studiensemester_kurzbz = ? + ) + ORDER BY + start DESC + LIMIT ? + '; + + return $this->execQuery($qry, + [ + $studiensemester_kurzbz, + $studiensemester_kurzbz, + $limit + ] + ); + } + /** * getNearest */ @@ -188,6 +229,82 @@ class Studiensemester_model extends DB_Model return $this->execQuery($query, array($date,$date,$date,$date)); } + /** + * Gets all Studiensemester where the range dates are contained + * or the nearest if date is not contained + * @param $from + * @param $to + * @return array|null + */ + public function getContainingOrNearestByDateRange($from, $to) + { + if (date_format(date_create($from), 'Y-m-d') > (date_format(date_create($to), 'Y-m-d'))) + return success(array()); + + $query = <<db->escape($from)}::date BETWEEN s.start AND s.ende + ORDER BY + s.start DESC + LIMIT 1 + ), + semester_interval_enddate AS ( + SELECT + s.* + FROM + public.tbl_studiensemester s + WHERE + {$this->db->escape($to)}::date BETWEEN s.start AND s.ende + ORDER BY + s.start DESC + LIMIT 1 + ), + nearest_semester_interval_startdate AS ( + SELECT + LEAST(ABS(s.start - {$this->db->escape($from)}::date), ABS(s.ende - {$this->db->escape($from)}::date)) AS mindiff, + s.* + FROM + public.tbl_studiensemester s + WHERE + s.ende < {$this->db->escape($from)}::date + ORDER BY + 1 ASC + LIMIT 1 + ), + nearest_semester_interval_enddate AS ( + SELECT + LEAST(ABS(s.start - {$this->db->escape($to)}::date), ABS(s.ende - {$this->db->escape($to)}::date)) AS mindiff, + s.* + FROM + public.tbl_studiensemester s + WHERE + s.start > {$this->db->escape($to)}::date + ORDER BY + 1 ASC + LIMIT 1 + ) + SELECT + COALESCE( + (SELECT studiensemester_kurzbz FROM semester_interval_startdate), + (SELECT studiensemester_kurzbz FROM nearest_semester_interval_startdate) + ) AS studiensemester_kurzbz + UNION + SELECT + COALESCE( + (SELECT studiensemester_kurzbz FROM semester_interval_enddate), + (SELECT studiensemester_kurzbz FROM nearest_semester_interval_enddate) + ) AS studiensemester_kurzbz + +EOSQL; + + return $this->execReadonlyQuery($query); + } + /** * Gets all Studiensemester between two dates * @param $from diff --git a/application/models/person/Benutzerfunktion_model.php b/application/models/person/Benutzerfunktion_model.php index dff422b7d..dfed7c332 100644 --- a/application/models/person/Benutzerfunktion_model.php +++ b/application/models/person/Benutzerfunktion_model.php @@ -260,7 +260,6 @@ class Benutzerfunktion_model extends DB_Model return $this->execQuery($query, $parameters_array); } - /** * Get active Kompetenzfeldleitung bei UID. * @@ -296,7 +295,6 @@ class Benutzerfunktion_model extends DB_Model return $this->execQuery($query, $parameters_array); } - public function insertBenutzerfunktion($Json) { unset($Json['benutzerfunktion_id']); diff --git a/public/css/components/FilterComponent.css b/public/css/components/FilterComponent.css index 3edf989a6..7779f78fc 100644 --- a/public/css/components/FilterComponent.css +++ b/public/css/components/FilterComponent.css @@ -70,6 +70,10 @@ margin-top: 20px; } +.filter-table-dataset .tabulator-tableholder { + padding-bottom: 16px; +} + .tabulator { font-size: 1rem; } diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js index 08d6a8947..9f8290222 100644 --- a/public/js/components/Betriebsmittel/Betriebsmittel.js +++ b/public/js/components/Betriebsmittel/Betriebsmittel.js @@ -433,6 +433,7 @@ export default { :label="$p.t('wawi/ausgegebenam')" name="ausgegebenam" v-model="formData.ausgegebenam" + model-type="yyyy-MM-dd" auto-apply :enable-time-picker="false" text-input @@ -449,6 +450,7 @@ export default { :label="$p.t('wawi/retouram')" name="retouram" v-model="formData.retouram" + model-type="yyyy-MM-dd" auto-apply :enable-time-picker="false" text-input diff --git a/public/js/components/Funktionen/Funktionen.js b/public/js/components/Funktionen/Funktionen.js index 2c1bce445..bf02995a1 100644 --- a/public/js/components/Funktionen/Funktionen.js +++ b/public/js/components/Funktionen/Funktionen.js @@ -551,6 +551,7 @@ export default { container-class="mb-3 col-3" type="DatePicker" v-model="formData.datum_von" + model-type="yyyy-MM-dd" name="datum_von" :label="$p.t('ui/from') + ' *'" auto-apply @@ -566,6 +567,7 @@ export default { container-class="mb-3 col-3" type="DatePicker" v-model="formData.datum_bis" + model-type="yyyy-MM-dd" name="datum_bis" :label="$p.t('global/bis')" auto-apply diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js index b23eebbcd..36ee5f114 100644 --- a/public/js/components/Messages/Details/NewMessage/Modal.js +++ b/public/js/components/Messages/Details/NewMessage/Modal.js @@ -56,6 +56,7 @@ export default { previewText: null, previewBody: "", replyData: null, + isSending: false } }, methods: { @@ -113,6 +114,9 @@ export default { data.append('data', JSON.stringify(this.formData)); data.append('ids', JSON.stringify(this.id)); + //for disabling sendButton and show Spinner + this.isSending = true; + return this.$refs.formMessage .call(ApiMessages.sendMessage(this.typeId, data)) .then(response => { @@ -121,6 +125,7 @@ export default { this.resetForm(); }).catch(this.$fhcAlert.handleSystemError) .finally(() => { + this.isSending = false; //just emit if no multitasking if(this.id.length == 1){ @@ -288,6 +293,9 @@ export default { dialog-class=" modal-dialog-scrollable modal-xl modal-msg" header-class="flex-wrap pb-0" body-class="px-3 py-2" + :backdrop="isSending ? 'static' : true" + :keyboard="!isSending" + :noCloseBtn="isSending" @hidden.bs.modal="resetForm" > @@ -476,7 +484,12 @@ export default { - + diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js index 00b4e92a8..6a0dfa222 100644 --- a/public/js/components/Messages/Details/NewMessage/NewDiv.js +++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js @@ -55,6 +55,7 @@ export default { previewBody: "", replyData: null, messageSent: false, + isSending: false } }, methods: { @@ -104,16 +105,21 @@ export default { data.append('data', JSON.stringify(this.formData)); data.append('ids', JSON.stringify(this.id)); + //for disabling sendButton and show Spinner + this.isSending = true; + return this.$api .call(ApiMessages.sendMessage(this.typeId, data)) .then(response => { - if(this.openMode == "inSamePage") + if(this.openMode == "inSamePage") { this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent')); + } this.hideTemplate(); this.resetForm(); this.messageSent = true; }).catch(this.$fhcAlert.handleSystemError) .finally(() => { + this.isSending = false; if(this.openMode == "inSamePage" && this.id.length == 1 ){ this.$emit('reloadTable'); } @@ -413,7 +419,12 @@ export default { - + diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js index e59492cf5..a03c7f50f 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details.js +++ b/public/js/components/Stv/Studentenverwaltung/Details.js @@ -15,7 +15,8 @@ export default { data() { return { configStudent: {}, - configStudents: {} + configStudents: {}, + activeTab: null }; }, props: { @@ -74,6 +75,10 @@ export default { }) .catch(this.$fhcAlert.handleSystemError); }, + handleTabChanged(key) { + this.activeTab = key + this.reload() + }, reload() { if (this.$refs.tabs?.$refs?.current?.reload) this.$refs.tabs.$refs.current.reload(); @@ -111,12 +116,12 @@ export default { :useprimevue="true" :modelValue="students[0]" :config="config" - :default="$route.params.tab" + :default="activeTab ?? $route.params.tab" style="flex: 1 1 0%; height: 0%" - @changed="reload" + @changed="handleTabChanged" > - +
Loading... diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js index 1c2c53dd7..df9b74c05 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js @@ -434,7 +434,10 @@ export default { } if (!this.formData.akadgrad_id && this.arrAkadGrad.length > 0) { - this.formData.akadgrad_id = this.arrAkadGrad[0].akadgrad_id; + if(this.student.geschlecht == 'w') + this.formData.akadgrad_id = this.arrAkadGrad[1].akadgrad_id; + else + this.formData.akadgrad_id = this.arrAkadGrad[0].akadgrad_id; } }, printDocument(link) { @@ -718,7 +721,7 @@ export default { :key="grad.akadgrad_id" :value="grad.akadgrad_id" > - {{grad.titel}} + {{ grad.titel }} ({{ grad.geschlecht }}) @@ -49,16 +54,16 @@ ref="formc" type-id: id to which table the notizdata should be connected... eg. person_id, prestudent_id, uid (for mitarbeiter_uid), projekt_kurzbz, projektphase_id, projekttask_id, bestellung_id, lehreinheit_id, anrechnung_id -notizLayout: "classicFas", "twoColumnsFormLeft", twoColumnsFormRight, popupModal" +notizLayout: "classicFas", "twoColumnsFormLeft", twoColumnsFormRight, popupModal"; is now configurable in config/stv.php showErweitert: if true: section with following fields will be displayed: - 'verfasser', 'bearbeiter', 'von', 'bis' + 'verfasser', 'bearbeiter', 'von', 'bis' and 'erledigt'; is now configurable in config/stv.php showDocument: if true: section with documentHandling will be displayed showTinyMCE: if true: section with WYSIWYG Editor for Text will be displayed -visibleColumns: list, which fields shoult be showed as default in filter component +visibleColumns: list, which fields should be showed as default in filter component fullVersion: :visibleColumns="['titel','text','bearbeiter','verfasser','von','bis','dokumente','erledigt','notiz_id','notizzuordnung_id','id','lastupdate']" diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js index 5f70e4951..1d8d5ac26 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js @@ -325,6 +325,7 @@ export default { :label="$p.t('infocenter', 'zgvDatum')" type="DatePicker" v-model="data.zgvdatum" + model-type="yyyy-MM-dd" name="zgvdatum" no-today auto-apply @@ -389,6 +390,7 @@ export default { :label="$p.t('lehre', 'zgvMasterDatum')" type="DatePicker" v-model="data.zgvmadatum" + model-type="yyyy-MM-dd" name="zgvmadatum" no-today auto-apply @@ -454,6 +456,7 @@ export default { :label="$p.t('lehre', 'zgvDoktorDatum')" type="DatePicker" v-model="data.zgvdoktordatum" + model-type="yyyy-MM-dd" name="zgvdoktordatum" no-today auto-apply diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js index 7507b0ebd..ce190fdb5 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js @@ -276,6 +276,7 @@ export default{ container-class="mb-3" type="DatePicker" v-model="formData.datum" + model-type="yyyy-MM-dd" name="datum" :label="$p.t('global/datum')" auto-apply @@ -291,6 +292,7 @@ export default{ container-class="mb-3" type="DatePicker" v-model="formData.bestaetigtam" + model-type="yyyy-MM-dd" name="bestaetigtam" :label="$p.t('lehre/bestaetigt_am')" auto-apply @@ -306,13 +308,14 @@ export default{ container-class="mb-3" type="DatePicker" v-model="formData.bewerbung_abgeschicktamum" + model-type="yyyy-MM-dd HH:mm:ss" name="bewerbung_abgeschicktamum" :label="$p.t('lehre/bewerbung_abgeschickt_am')" auto-apply - :enable-time-picker="false" - format="dd.MM.yyyy" + :enable-time-picker="true" + format="dd.MM.yyyy HH:mm:ss" text-input - preview-format="dd.MM.yyyy" + preview-format="dd.MM.yyyy HH:mm:ss" :teleport="true" :disabled="bisLocked || !hasPrestudentstatusPermission" > diff --git a/public/js/components/Stv/Studentenverwaltung/List/New.js b/public/js/components/Stv/Studentenverwaltung/List/New.js index 6b7df3581..90d4e498b 100644 --- a/public/js/components/Stv/Studentenverwaltung/List/New.js +++ b/public/js/components/Stv/Studentenverwaltung/List/New.js @@ -285,6 +285,7 @@ export default { uid="stv-list-new-gebdatum" name="gebdatum" v-model="formDataPerson['gebdatum']" + model-type="yyyy-MM-dd" :disabled="!!person" @update:model-value="loadSuggestions" text-input diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js index 50a8cf0e7..b0b5aecc1 100644 --- a/public/js/components/Tabs.js +++ b/public/js/components/Tabs.js @@ -219,7 +219,7 @@ export default { :scrollable="true" :lazy="true" :activeIndex="calcActiveIndex" - :pt="{navContainer:{style: 'flex: 0 0 auto;'}, panelContainer:{class: 'overflow-y-scroll p-2', style: 'flex: 1 1 auto;'}}" + :pt="{navContainer:{style: 'flex: 0 0 auto;'}, panelContainer:{class: 'overflow-y-scroll p-2 pe-3', style: 'flex: 1 1 auto;'}}" @tab-click="handleTabClick" > !this.pk[key]); + }, + getReadonly() { + return this.readonly; + }, filterArray() { if (!this.filter || Array.isArray(this.filter)) return this.filter; @@ -61,6 +70,10 @@ export default { }, watch: { pk(n, o) { + + // If the provided pk is _not_ valid + if (Object.keys(n).every(key => !n[key])) return; + if (!this.$refs.fetch) return; // NOTE(chris): no initial load yet @@ -124,6 +137,7 @@ export default { template: `
` -} \ No newline at end of file +} diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js index a4dcb6cbc..3d44b51da 100644 --- a/public/js/components/filter/Filter.js +++ b/public/js/components/filter/Filter.js @@ -218,15 +218,23 @@ export const CoreFilterCmpt = { }, columnsForFilter() { if (!this.filteredColumns || !this.datasetMetadata) return []; - const localizedColumnTitles = this.tabulator.getLang().columns; + const isTabulatorLocalized = !!this.$props.tabulatorOptions.locale; - const filterTitles = this.filteredColumns.reduce((a, c) => { - a[c.field] = - isTabulatorLocalized && localizedColumnTitles[c.field] - ? localizedColumnTitles[c.field] - : c.title; - return a; - }, {}); + + let filterTitles; + if (isTabulatorLocalized) { + const localizedColumnTitles = this.tabulator.getLang().columns; + filterTitles = this.filteredColumns.reduce((a, c) => { + a[c.field] = localizedColumnTitles[c.field]; + return a; + }, {}); + } else { + filterTitles = this.filteredColumns.reduce((a, c) => { + a[c.field] = c.title; + return a; + }, {}); + } + return this.datasetMetadata.map((el) => ({ ...el, ...{ title: filterTitles[el.name] }, diff --git a/skin/images/sancho/sancho_footer_lvevaluierung_rollout.jpg b/skin/images/sancho/sancho_footer_lvevaluierung_rollout.jpg new file mode 100644 index 000000000..15809d851 Binary files /dev/null and b/skin/images/sancho/sancho_footer_lvevaluierung_rollout.jpg differ diff --git a/skin/images/sancho/sancho_header_lvevaluierung_rollout.jpg b/skin/images/sancho/sancho_header_lvevaluierung_rollout.jpg new file mode 100644 index 000000000..47a3c08c2 Binary files /dev/null and b/skin/images/sancho/sancho_header_lvevaluierung_rollout.jpg differ