blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 12:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor VV: change handling of selections, allow only strg for multiselect in vetraegen and for adding unassignedVertraege

Browse Source
This commit is contained in:
ma0068
2026-02-13 09:24:36 +01:00
parent aec0e5227f
commit fd35d20955
2 changed files with 136 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/components/Vertraege/List/Unassigned.js
+64 -20
View File
@@ -57,9 +57,11 @@ export default {
],
layout: 'fitColumns',
layoutColumnsOnNewData: false,
height: '200',
height: 200,
selectableRowsRangeMode: 'click',
selectableRows: true,
selectableRowsRollingSelection: false, //only allow multiselect with STRG
index: "lehreinheit_id",
persistenceID: 'core-contracts-unassigned'
},
tabulatorEvents: [
@@ -67,7 +69,9 @@ export default {
event: 'rowClick',
handler: (e, row) => {
const data = row.getData();
this.toggleRowClick(data);
//this.toggleRowClick(e, data);
this.toggleSelect(e, data);
}
},
{
@@ -125,18 +129,18 @@ export default {
}
},
watch: {
//TODO(Manu) check if still working
//TODO(Manu) check
person_id() {
this.$refs.table.reloadTable();
//this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getAllContractsNotAssigned/' + this.person_id);
},
clickedRows() {
/* clickedRows() {
this.$refs.table.reloadTable();
//this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getAllContractsNotAssigned/' + this.person_id);
},
},*/
},
methods: {
toggleRowClick(rowData){
/* toggleRowClick(rowData){
// check row
const exists = this.clickedRows.some(row => JSON.stringify(row) === JSON.stringify(rowData));
@@ -147,10 +151,48 @@ export default {
} else {
this.clickedRows.push(rowData);
this.sumBetragLehrauftraege += Number(rowData.betrag1);
//console.log(rowData.betrag1);
this.handleSumUp();
}
},*/
toggleSelect(event, rowData) {
const isCtrlPressed = event.ctrlKey;
if (!isCtrlPressed) {
const isSameSingleSelection =
this.clickedRows.length === 1 &&
this.clickedRows[0].lehreinheit_id === rowData.lehreinheit_id;
if (isSameSingleSelection) {
this.clickedRows = [];
this.sumBetragLehrauftraege = 0;
} else {
this.clickedRows = [rowData];
this.sumBetragLehrauftraege = Number(rowData.betrag1);
}
}
// Multiselect
else {
const exists = this.clickedRows.some(
row => row.lehreinheit_id === rowData.lehreinheit_id
);
if (exists) {
this.clickedRows = this.clickedRows.filter(
row => row.lehreinheit_id !== rowData.lehreinheit_id
);
this.sumBetragLehrauftraege -= Number(rowData.betrag1);
} else {
this.clickedRows.push(rowData);
this.sumBetragLehrauftraege += Number(rowData.betrag1);
}
}
this.handleSumUp();
},
emitSaveEvent() {
this.$emit('saveClickedRows', this.clickedRows);
@@ -164,6 +206,21 @@ export default {
this.$emit("sum-updated", this.sumBetragLehrauftraege);
},
},
/*
<p v-if="clickedRows.length > 0" >{{$p.t('vertrag', 'text_addLehrauftrag')}}</p>
<div v-for="item in clickedRows" :key="item.lehreinheit_id" class="row">
<div class="col-md-6">
<input
class="form-control"
type="text"
:value="item.type + ' | ' + item.studiensemester_kurzbz + ' | ' + item.bezeichnung + ' ( lehreinheit_id: ' + item.lehreinheit_id + ')'"
aria-label="readonly input example"
readonly
>
</div>
</div>
*/
template: `
<div class="core-contracts-unassigned h-50 d-flex flex-column w-100">
<p v-if="totalRows > 0">{{$p.t('vertrag', 'text_explainLehrauftrag')}}</p>
@@ -176,18 +233,5 @@ export default {
>
</core-filter-cmpt>
<p v-if="clickedRows.length > 0" >{{$p.t('vertrag', 'text_addLehrauftrag')}}</p>
<div v-for="item in clickedRows" :key="item.lehreinheit_id" class="row">
<div class="col-md-6">
<input
class="form-control"
type="text"
:value="item.type + ' | ' + item.studiensemester_kurzbz + ' | ' + item.bezeichnung + ' ( lehreinheit_id: ' + item.lehreinheit_id + ')'"
aria-label="readonly input example"
readonly
>
</div>
</div>
</div>`
}
public/js/components/Vertraege/Vertraege.js
+72 -24
View File
@@ -132,6 +132,7 @@ export default {
height: '250',
selectableRowsRangeMode: 'click',
selectableRows: true,
selectableRowsRollingSelection: false, //only allow multiselect with STRG
index: "vertrag_id",
persistence: {
sort: true,
@@ -179,7 +180,7 @@ export default {
});*/
}
},
{
/* {
//is just enabled for ADDON Injection KU: MultiprintHonorarvertrag
//(maybe enable also for ADDON FH Burgenland: MultiAccept later)
event: 'rowClick',
@@ -192,6 +193,16 @@ export default {
this.toggleRowClick(selectedContract, status, bezeichnung);
}
}
},*/
{
event: 'rowClick',
handler: (e, row) => {
if (!this.dataPrintHonorar?.multiselect) return;
const { vertrag_id, status, bezeichnung, vertragstyp_bezeichnung } = row.getData();
this.toggleRowClick(e, vertrag_id, status, bezeichnung, vertragstyp_bezeichnung);
}
},
{
event: "dataProcessed",
@@ -234,6 +245,8 @@ export default {
person_id() {
this.$refs.table.reloadTable();
this.arraySelectedContracts = [];
/* if(this.dataPrintHonorar?.multiselect)
this.dataPrintHonorar.multiselect = [];*/
},
},
methods: {
@@ -350,11 +363,12 @@ export default {
return this.$refs.contractstati.$refs.statusData
.call(this.endpoint.insertContractStatus(params))
.then(response => {
//this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
this.$refs.contractstati.closeModal();
this.$refs.contractstati.reload();
//this.reload(); //focus get lost with reload
this.pendingSelectId = params.vertrag_id;
this.reload();
})
.catch(this.$fhcAlert.handleSystemError);
},
@@ -395,7 +409,8 @@ export default {
this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
this.$refs.contractstati.closeModal();
this.$refs.contractstati.reload();
//this.reload(); //focus gets lost with reload
this.pendingSelectId = params.vertrag_id;
this.reload();
})
.catch(this.$fhcAlert.handleSystemError);
},
@@ -489,7 +504,7 @@ export default {
}
//check if status=="Genehmigt"
const statusNotGenehmigtExists = this.arraySelectedContracts.some(([_, status]) => status !== 'Genehmigt');
const statusNotGenehmigtExists = this.arraySelectedContracts.some(v => v.status !== 'Genehmigt');
if(statusNotGenehmigtExists) {
this.$fhcAlert.alertError(this.$p.t('vertrag', 'alertOnlyApprovedContracts'));
return;
@@ -499,14 +514,14 @@ export default {
let vertragString = '';
this.arraySelectedContracts.forEach(element => {
vertragString += '&vertrag_id[]=' + element[0].toString();
vertragString += '&vertrag_id[]=' + element.vertrag_id.toString();
});
let linkToPdf = this.dataPrintHonorar.link +
'content/pdfExport.php?xml=' + this.dataPrintHonorar.xml + '&xsl=' + this.dataPrintHonorar.xsl + '&mitarbeiter_uid=' + this.mitarbeiter_uid + vertragString + '&output=pdf&uid=' + this.mitarbeiter_uid;
window.open(linkToPdf, '_blank');
},
toggleRowClick(contractId, status, bezeichnung) {
/* toggleRowClick(contractId, status, bezeichnung) {
const index = this.arraySelectedContracts.findIndex(
([id]) => id === contractId
);
@@ -515,10 +530,41 @@ export default {
} else {
this.arraySelectedContracts.push([contractId, status, bezeichnung]);
}
},*/
toggleRowClick(event, vertrag_id, status, bezeichnung, vertragstyp_bezeichnung) {
if (!this.dataPrintHonorar?.multiselect) return;
const isCtrl = event.ctrlKey || event.metaKey;
const entry = {
vertrag_id,
status,
bezeichnung,
vertragstyp_bezeichnung
};
// Single click
if (!isCtrl) {
this.arraySelectedContracts = [entry];
return;
}
// CTRL / CMD → toggle
const index = this.arraySelectedContracts.findIndex(
e => e.vertrag_id === vertrag_id
);
if (index === -1) {
this.arraySelectedContracts.push(entry);
//this.arraySelectedContracts.push([entry.vertrag_id, entry.status, entry.bezeichnung, entry.vertragstyp_bezeichnung]);
} else {
this.arraySelectedContracts.splice(index, 1);
}
},
clearSelection(){
/* clearSelection(){
this.arraySelectedContracts = [];
}
this.$refs.table.tabulator.deselectRow();
}*/
},
created() {
Promise.all([
@@ -544,33 +590,28 @@ export default {
});
this.getFormattedDate();
},
template: `
<div class="core-contracts h-100 d-flex flex-column">
/*
<template v-if="arraySelectedContracts.length >= 2" class="container mt-2">
<!-- injected print functionality for KU Linz (printHonorarvertrag) -->
<template v-if="arraySelectedContracts.length >= 2" class="container mt-2">
<div v-for="item in arraySelectedContracts" :key="item[0]">
<div v-for="item in arraySelectedContracts" :key="item.vertrag_id">
<input
class="form-control"
type="text"
:value="item[2] + ' | ' + item[1] + ' (ID: ' + item[0] + ')'"
:value="item.vertragstyp_bezeichnung + ' | ' + item.bezeichnung + ' | ' + item.status + ' (ID: ' + item.vertrag_id + ')'"
aria-label="readonly input example"
readonly
>
</div>
</template>
<template v-if="arraySelectedContracts.length >= 2" class="d-flex">
<div class="ms-auto mt-2">
<button type="button" class="btn btn-secondary mx-1" @click="clearSelection()"><i class="fa fa-trash"></i></button>
<button :disabled="!this.hasSchreibrechte" type="button" class="btn btn-primary" @click="printContract()">{{$p.t('vertrag', 'printHonorarvertrag')}}</button>
</div>
</template>
{{arraySelectedContracts}} || {{dataPrintHonorar}}
<hr>
<button type="button" class="btn btn-secondary mx-1" @click="clearSelection()"><i class="fa fa-trash"></i></button>
*/
template: `
<div class="core-contracts h-100 d-flex flex-column">
<!-- filter: open means no status abgerechnet yet-->
<!-- filter: open means no status abgerechnet yet-->
<div class="justify-content-end pb-3">
<form-input
container-class="form-switch"
@@ -593,6 +634,13 @@ export default {
:new-btn-label="this.$p.t('ui', 'vertrag')"
@click:new="actionNewContract"
>
<!-- injected print functionality for KU Linz (printHonorarvertrag) -->
<template #actions v-if="arraySelectedContracts.length >= 2">
<div class="d-flex justify-content-center align-items-center gap-2 ps-4 position-absolute start-50 translate-middle-x">
<button :disabled="!this.hasSchreibrechte" type="button" class="btn btn-secondary" @click="printContract()">{{$p.t('vertrag', 'printHonorarvertrag')}}</button>
</div>
</template>
</core-filter-cmpt>
<div class="row">