mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-06-01 20:29:29 +00:00
delete commented out sections
This commit is contained in:
@@ -107,7 +107,7 @@ class Mitarbeiter_model extends DB_Model
|
||||
{
|
||||
$qry = "
|
||||
SELECT
|
||||
b.uid , p.person_id,
|
||||
b.uid , p.person_id,
|
||||
p.vorname, p.nachname,
|
||||
gebdatum,
|
||||
COALESCE(b.alias, b.uid) AS email,
|
||||
@@ -115,9 +115,6 @@ class Mitarbeiter_model extends DB_Model
|
||||
STRING_AGG(DISTINCT u.bezeichnung, ', ') AS Unternehmen,
|
||||
STRING_AGG(d.dienstverhaeltnis_id::TEXT, ', ') AS ids,
|
||||
b.aktiv
|
||||
-- CASE WHEN b.aktiv=true THEN 'aktiv'
|
||||
-- ELSE 'nicht aktiv'
|
||||
-- END as status //not working in header filter */
|
||||
FROM
|
||||
hr.tbl_dienstverhaeltnis d
|
||||
JOIN
|
||||
@@ -128,7 +125,7 @@ class Mitarbeiter_model extends DB_Model
|
||||
public.tbl_organisationseinheit u ON d.oe_kurzbz = u.oe_kurzbz
|
||||
JOIN
|
||||
hr.tbl_vertragsart va ON d.vertragsart_kurzbz = va.vertragsart_kurzbz
|
||||
";
|
||||
";
|
||||
|
||||
if($person_id)
|
||||
{
|
||||
@@ -138,9 +135,9 @@ class Mitarbeiter_model extends DB_Model
|
||||
$qry.= "
|
||||
GROUP BY
|
||||
b.uid, p.person_id, p.vorname, p.nachname, b.alias
|
||||
ORDER BY
|
||||
ORDER BY
|
||||
p.nachname, p.vorname;
|
||||
";
|
||||
";
|
||||
|
||||
$params = array($person_id);
|
||||
|
||||
|
||||
@@ -21,15 +21,8 @@ export default {
|
||||
}
|
||||
},
|
||||
data() {
|
||||
//TODO(Manu) props for filter: actually not necessary
|
||||
return {
|
||||
person_id: null,
|
||||
/* filterMa: {
|
||||
active: true,
|
||||
hasVertraege: true
|
||||
},*/
|
||||
/* vertragsarten:
|
||||
[ 'echterdv', 'externerlehrender', 'gastlektor']*/
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
@@ -43,9 +36,9 @@ export default {
|
||||
<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
|
||||
<vertical-split ref="vsplit">
|
||||
<template #top>
|
||||
<!-- <div class="d-flex flex-column" style="height: 100%;">-->
|
||||
<div class="d-flex flex-column" style="height: 100%;">
|
||||
<mitarbeiter-header :filterMa="filterMa" :vertragsarten="vertragsarten" @selectedPerson="selectPerson" />
|
||||
<!-- </div>-->
|
||||
</div>
|
||||
</template>
|
||||
<template #bottom>
|
||||
<div class="col" v-if="person_id!=null">
|
||||
|
||||
Reference in New Issue
Block a user