blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-18 23:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

corrects the way how to active ampeln check whether an ampel was bestaetigt or not and adds the Ampel_Benutzer_Bestaetigt_model

Browse Source
This commit is contained in:
SimonGschnell
2024-08-07 11:52:50 +02:00
parent c5f57a0689
commit ceb8eb9671
5 changed files with 213 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/Ampeln.php
+5 -3
View File
@@ -56,7 +56,9 @@ class Ampeln extends FHCAPI_Controller
$this->form_validation->set_rules('ampel_id', 'Ampel ID', 'required|integer');
if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
$insert_into_result = $this->AmpelModel->confirmAmpel($ampel_id,$this->uid);
// load Ampel_benutzer_bestaetigt_model to confirm the ampel
$this->load->model('content/Ampel_Benutzer_Bestaetigt_model', 'AmpelBenutzerBestaetigtModel');
$insert_into_result = $this->AmpelBenutzerBestaetigtModel->insert(["ampel_id"=> $ampel_id, "uid"=> $this->uid]);
$insert_into_result = $this->getDataOrTerminateWithError($insert_into_result);
@@ -78,8 +80,8 @@ class Ampeln extends FHCAPI_Controller
$activeAmpeln = $this->getDataOrTerminateWithError($activeAmpeln);
foreach($activeAmpeln as $ampel){
// only include non confirmed active ampeln in the result
// only include non confirmed active ampeln in the result
if(!$ampel->bestaetigt){
// check if the user was assigned to the ampel
application/core/DB_Model.php
-2
View File
@@ -94,8 +94,6 @@ class DB_Model extends CI_Model
$this->load->library('UDFLib');
// Loads the logs library
$this->load->library('LogLib');
}
// ------------------------------------------------------------------------------------------
application/models/content/Ampel_Benutzer_Bestaetigt_model.php
+14
View File
@@ -0,0 +1,14 @@
<?php
class Ampel_Benutzer_Bestaetigt_model extends DB_Model
{
/**
* Constructor
*/
public function __construct()
{
parent::__construct();
$this->dbTable = 'public.tbl_ampel_benutzer_bestaetigt';
$this->pk = 'ampel_benutzer_bestaetigt_id';
}
}
application/models/content/Ampel_model.php
+2 -24
View File
@@ -23,12 +23,12 @@ class Ampel_model extends DB_Model
$userLanguage = getUserLanguage();
$bestaetigt = '';
if($uid != null){
if($uid != null ){
$bestaetigt = ',
COALESCE((
SELECT true
FROM public.tbl_ampel_benutzer_bestaetigt a
WHERE a.ampel_id = ampel_id
WHERE a.ampel_id = ' . $this->dbTable . '.ampel_id
AND uid = ' . $this->escape($uid) . ' LIMIT 1), false) as bestaetigt';
}
@@ -111,28 +111,6 @@ class Ampel_model extends DB_Model
return $result; //will contain the error-msg from execQuery
}
/**
* confirms Ampel by the user.
* @param int $ampel_id Ampel-ID
* @param string $uid UID
* @return stdClass insert into result
*/
public function confirmAmpel($ampel_id, $uid)
{
$this->load->library('form_validation');
$this->form_validation->set_data(['ampel_id' => $ampel_id, 'uid' => $uid]);
$this->form_validation->set_rules('ampel_id', 'Ampel ID', 'required|integer');
$this->form_validation->set_rules('uid', 'UID', 'required');
if ($this->form_validation->run() == FALSE)
$this->terminateWithValidationErrors($this->form_validation->error_array());
return $this->execQuery('
INSERT INTO public.tbl_ampel_benutzer_bestaetigt (ampel_id, uid)
VALUES (?,?);', array($ampel_id, $uid));
}
/**
* checks if a user is assigned to an ampel
* @param string $uid userID
public/js/components/DashboardWidget/Ampel.js
+192 -193
View File
@@ -2,209 +2,208 @@ import AbstractWidget from './Abstract';
import BaseOffcanvas from '../Base/Offcanvas';
export default {
name: 'WidgetsAmpel',
components: { BaseOffcanvas },
data: () => ({
WIDGET_AMPEL_MAX: 4,
filter: '',
source: '',
allAmpeln:null,
activeAmpeln:null,
}),
mixins: [
AbstractWidget
],
computed: {
ampelnComputed(){
switch(this.source)
{
case 'offen': return this.applyFilter(this.activeAmpeln);
case 'alle': return this.applyFilter(this.allAmpeln);
default: return this.applyFilter(this.activeAmpeln);
}
},
ampelnOverview () {
return this.activeAmpeln?.slice(0, this.WIDGET_AMPEL_MAX); // show only newest 4 active ampeln
},
count () {
let datasource = this.activeAmpeln;
if (this.source == 'offen') datasource = this.activeAmpeln;
if (this.source == 'alle') datasource = this.allAmpeln;
name: 'WidgetsAmpel',
components: { BaseOffcanvas },
data: () => ({
WIDGET_AMPEL_MAX: 4,
filter: '',
source: '',
allAmpeln:null,
activeAmpeln:null,
}),
mixins: [
AbstractWidget
],
computed: {
ampelnComputed(){
switch(this.source)
{
case 'offen': return this.applyFilter(this.activeAmpeln);
case 'alle': return this.applyFilter(this.allAmpeln);
default: return this.applyFilter(this.activeAmpeln);
}
},
ampelnOverview () {
return this.activeAmpeln?.slice(0, this.WIDGET_AMPEL_MAX); // show only newest 4 active ampeln
},
count () {
let datasource = this.activeAmpeln;
if (this.source == 'offen') datasource = this.activeAmpeln;
if (this.source == 'alle') datasource = this.allAmpeln;
return {
verpflichtend: datasource?.filter(item => item.verpflichtend).length,
ueberfaellig: datasource?.filter(item => (new Date() > new Date(item.deadline)) && !item.bestaetigt).length,
alle: datasource?.length
}
}
},
methods: {
applyFilter(data){
switch(this.filter)
{
case 'verpflichtend': return data?.filter(item => item.verpflichtend);
case 'ueberfaellig': return data?.filter(item => (new Date() > new Date(item.deadline)) && !item.bestaetigt);
default: return data;
}
},
toggleFilter(value){
this.filter === value ? this.filter = '' : this.filter = value;
},
closeOffcanvasAmpeln()
{
for (let i = 0; i < this.ampelnComputed.length; i++)
{
let ampelId = this.ampelnComputed[i].ampel_id;
if(this.$refs['ampelCollapse_' + ampelId]){
this.$refs['ampelCollapse_' + ampelId][0].classList.remove('show');
}
}
},
openOffcanvasAmpel(ampelId){
// Close earlier opened Ampeln
this.closeOffcanvasAmpeln();
return {
verpflichtend: datasource?.filter(item => item.verpflichtend).length,
ueberfaellig: datasource?.filter(item => (new Date() > new Date(item.deadline)) && !item.bestaetigt).length,
alle: datasource?.length
}
}
},
methods: {
applyFilter(data){
switch(this.filter)
{
case 'verpflichtend': return data?.filter(item => item.verpflichtend);
case 'ueberfaellig': return data?.filter(item => (new Date() > new Date(item.deadline)) && !item.bestaetigt);
default: return data;
}
},
toggleFilter(value){
this.filter === value ? this.filter = '' : this.filter = value;
},
closeOffcanvasAmpeln()
{
for (let i = 0; i < this.ampelnComputed.length; i++)
{
let ampelId = this.ampelnComputed[i].ampel_id;
if(this.$refs['ampelCollapse_' + ampelId]){
this.$refs['ampelCollapse_' + ampelId][0].classList.remove('show');
}
}
},
openOffcanvasAmpel(ampelId){
// Close earlier opened Ampeln
this.closeOffcanvasAmpeln();
// Show given Ampel
this.$refs['ampelCollapse_' + ampelId][0].classList.add('show');
},
closeOffcanvas(){
this.closeOffcanvasAmpeln();
this.filter = '';
// maybe we also want to reset the source (open/alle) of the displayed ampeln
},
async fetchNonConfirmedActiveAmpeln(){
await this.$fhcApi.factory.ampeln.open().then(res=>{
this.activeAmpeln = res.data.sort((a,b) => new Date(b.deadline) - new Date(a.deadline));
});
},
async fetchAllActiveAmpeln(){
await this.$fhcApi.factory.ampeln.all().then(res=>{
this.allAmpeln = res.data.sort((a,b) => new Date(b.deadline) - new Date(a.deadline));
});
},
async confirm(ampelId){
this.$fhcApi.factory.ampeln.confirm(ampelId)
.then(res => res.data)
.then(result => {
this.$fhcAlert.alertSuccess(this.$p.t('ampeln','ampelBestaetigt'));
})
.catch(this.$fhcAlert.handleSystemError);
// Show given Ampel
this.$refs['ampelCollapse_' + ampelId][0].classList.add('show');
},
closeOffcanvas(){
this.closeOffcanvasAmpeln();
this.filter = '';
// maybe we also want to reset the source (open/alle) of the displayed ampeln
},
async fetchNonConfirmedActiveAmpeln(){
await this.$fhcApi.factory.ampeln.open().then(res=>{
this.activeAmpeln = res.data.sort((a,b) => new Date(b.deadline) - new Date(a.deadline));
});
},
async fetchAllActiveAmpeln(){
await this.$fhcApi.factory.ampeln.all().then(res=>{
this.allAmpeln = res.data.sort((a,b) => new Date(b.deadline) - new Date(a.deadline));
});
},
async confirm(ampelId){
this.$fhcApi.factory.ampeln.confirm(ampelId)
.then(() => {
this.$fhcAlert.alertSuccess(this.$p.t('ampeln','ampelBestaetigt'));
})
.catch(this.$fhcAlert.handleSystemError);
// update the ampeln by refetching them
this.fetchNonConfirmedActiveAmpeln();
this.fetchAllActiveAmpeln();
},
validateBtnTxt(buttontext){
// update the ampeln by refetching them
this.fetchNonConfirmedActiveAmpeln();
this.fetchAllActiveAmpeln();
},
validateBtnTxt(buttontext){
if(buttontext instanceof Array && !buttontext.length) return this.$p.t('ui','bestaetigen');
if(buttontext instanceof Array && !buttontext.length) return this.$p.t('ui','bestaetigen');
if(!buttontext) return this.$p.t('ui','bestaetigen');
if(!buttontext) return this.$p.t('ui','bestaetigen');
return buttontext;
}
},
created() {
this.$emit('setConfig', false);
},
async mounted() {
await this.fetchNonConfirmedActiveAmpeln();
await this.fetchAllActiveAmpeln();
},
template: /*html*/`
<div class="widgets-ampel w-100 h-100">
<div v-if="activeAmpeln" class="d-flex flex-column justify-content-between">
<div class="d-flex">
<header class="me-auto"><b>{{$p.t('ampeln','newestAmpeln')}}</b></header>
<div class="mb-2 text-danger"><a href="#allAmpelOffcanvas" data-bs-toggle="offcanvas">{{$p.t('ampeln','allAmpeln')}}</a></div>
</div>
<div class="d-flex justify-content-end">
<a v-if="count.ueberfaellig > 0" href="#allAmpelOffcanvas" data-bs-toggle="offcanvas" @click="filter = 'ueberfaellig'" class="text-decoration-none"><span class="badge bg-danger me-1"><i class="fa fa-solid fa-bolt"></i> {{$p.t('ampeln','overdue')}}: <b>{{ count.ueberfaellig }}</b></span></a>
</div>
<div v-for="ampel in ampelnOverview" :key="ampel.ampel_id" class="mt-2">
<div class="card">
<div class="card-body">
<div class="position-relative">
<div class="d-flex">
<div class="text-muted small me-auto"><small>{{$p.t('ampeln','deadline')}}: {{ getDate(ampel.deadline) }}</small></div>
<div v-if="(new Date() > new Date(ampel.deadline)) && !ampel.bestaetigt "><span class="badge bg-danger"><i class="fa fa-solid fa-bolt"></i></span></div>
<div v-if="ampel.verpflichtend"><span class="badge bg-warning ms-1"><i class="fa fa-solid fa-triangle-exclamation"></i></span></div>
<div v-if="ampel.bestaetigt"><span class="badge bg-success ms-1"><i class="fa fa-solid fa-circle-check"></i></span></div>
</div>
</div>
<a href="#allAmpelOffcanvas" data-bs-toggle="offcanvas" class="stretched-link" @click="openOffcanvasAmpel(ampel.ampel_id)">{{ ampel.kurzbz }}</a><br>
</div>
</div>
</div>
return buttontext;
}
},
created() {
this.$emit('setConfig', false);
},
async mounted() {
await this.fetchNonConfirmedActiveAmpeln();
await this.fetchAllActiveAmpeln();
},
template: /*html*/`
<div class="widgets-ampel w-100 h-100">
<div v-if="activeAmpeln" class="d-flex flex-column justify-content-between">
<div class="d-flex">
<header class="me-auto"><b>{{$p.t('ampeln','newestAmpeln')}}</b></header>
<div class="mb-2 text-danger"><a href="#allAmpelOffcanvas" data-bs-toggle="offcanvas">{{$p.t('ampeln','allAmpeln')}}</a></div>
</div>
<div class="d-flex justify-content-end">
<a v-if="count.ueberfaellig > 0" href="#allAmpelOffcanvas" data-bs-toggle="offcanvas" @click="filter = 'ueberfaellig'" class="text-decoration-none"><span class="badge bg-danger me-1"><i class="fa fa-solid fa-bolt"></i> {{$p.t('ampeln','overdue')}}: <b>{{ count.ueberfaellig }}</b></span></a>
</div>
<div v-for="ampel in ampelnOverview" :key="ampel.ampel_id" class="mt-2">
<div class="card">
<div class="card-body">
<div class="position-relative">
<div class="d-flex">
<div class="text-muted small me-auto"><small>{{$p.t('ampeln','deadline')}}: {{ getDate(ampel.deadline) }}</small></div>
<div v-if="(new Date() > new Date(ampel.deadline)) && !ampel.bestaetigt "><span class="badge bg-danger"><i class="fa fa-solid fa-bolt"></i></span></div>
<div v-if="ampel.verpflichtend"><span class="badge bg-warning ms-1"><i class="fa fa-solid fa-triangle-exclamation"></i></span></div>
<div v-if="ampel.bestaetigt"><span class="badge bg-success ms-1"><i class="fa fa-solid fa-circle-check"></i></span></div>
</div>
</div>
<a href="#allAmpelOffcanvas" data-bs-toggle="offcanvas" class="stretched-link" @click="openOffcanvasAmpel(ampel.ampel_id)">{{ ampel.kurzbz }}</a><br>
</div>
</div>
</div>
<div v-if="activeAmpeln && activeAmpeln.length == 0" class="card card-body mt-4 p-4 text-center">
<span class="text-success h2"><i class="fa fa-solid fa-circle-check"></i></span>
<span class="text-success h5">{{$p.t('ampeln','super')}}</span><br>
<span class="small">{{$p.t('ampeln','noOpenAmpeln')}}</span>
</div>
</div>
<div v-else>
<header class="me-auto"><b>{{$p.t('ampeln','newestAmpeln')}} </b></header>
<template v-for="n in WIDGET_AMPEL_MAX">
<div v-if="activeAmpeln && activeAmpeln.length == 0" class="card card-body mt-4 p-4 text-center">
<span class="text-success h2"><i class="fa fa-solid fa-circle-check"></i></span>
<span class="text-success h5">{{$p.t('ampeln','super')}}</span><br>
<span class="small">{{$p.t('ampeln','noOpenAmpeln')}}</span>
</div>
</div>
<div v-else>
<header class="me-auto"><b>{{$p.t('ampeln','newestAmpeln')}} </b></header>
<template v-for="n in WIDGET_AMPEL_MAX">
<div class="mt-2 card" aria-hidden="true">
<div class="card-body">
<p class="card-text placeholder-glow">
<span class="placeholder col-7"></span>
<span class="placeholder col-12"></span>
</p>
</div>
</div>
</template>
<div class="mt-2 card" aria-hidden="true">
<div class="card-body">
<p class="card-text placeholder-glow">
<span class="placeholder col-7"></span>
<span class="placeholder col-12"></span>
</p>
</div>
</div>
</template>
</div>
</div>
</div>
</div>
<!-- All Ampeln Offcanvas -->
<BaseOffcanvas id="allAmpelOffcanvas" :closeFunc="closeOffcanvas">
<template #title><header><b>{{$p.t('ampeln','allMyAmpeln')}}</b></header></template>
<template #body>
<div class="d-flex justify-content-evenly">
<div class="form-check form-check-inline form-control-sm">
<input class="form-check-input" type="radio" v-model="source" id="offen" value="offen" checked>
<label class="form-check-label" for="offen">{{$p.t('ampeln','openAmpeln')}}</label>
</div>
<div class="form-check form-check-inline form-control-sm">
<input class="form-check-input" type="radio" v-model="source" id="alle" value="alle" >
<label class="form-check-label" for="alle">{{$p.t('ampeln','allAmpeln')}}</label>
</div>
</div>
<div class="col"><button class="btn btn-light w-100" @click="filter = ''"><small>{{$p.t('ui','alle')}}: <b>{{ count.alle }}</b></small></button></div>
<div class="row row-cols-2 g-2 mt-1">
<div class="col"><button class="btn btn-danger w-100" @click="toggleFilter('ueberfaellig')"><i class="fa fa-solid fa-bolt me-2"></i><small :class="{'text-decoration-underline':filter==='ueberfaellig', 'fw-bold':filter==='ueberfaellig'}">{{$p.t('ampeln','overdue')}}: <b>{{ count.ueberfaellig }}</b></small></button></div>
<div class="col"><button class="btn btn-warning w-100" @click="toggleFilter('verpflichtend')"><i class="fa fa-solid fa-triangle-exclamation me-2"></i><small :class="{'text-decoration-underline':filter==='ueberfaellig', 'fw-bold':filter==='ueberfaellig'}" >{{$p.t('ampeln','mandatory')}}: <b>{{ count.verpflichtend }}</b></small></button></div>
</div>
<div v-for="ampel in ampelnComputed" :key="ampel.ampel_id" class="mt-2">
<ul class="list-group">
<li class="list-group-item small">
<div class="position-relative"><!-- prevents streched-link from stretching outside this parent element -->
<div class="d-flex">
<span class="small text-muted me-auto"><small>{{$p.t('ampeln','deadline')}}: {{ getDate(ampel.deadline) }}</small></span>
<div v-if="(new Date() > new Date(ampel.deadline)) && !ampel.bestaetigt"><span class="badge bg-danger"><i class="fa fa-solid fa-bolt"></span></div>
<div v-if="ampel.verpflichtend"><span class="badge bg-warning ms-1"><i class="fa fa-solid fa-triangle-exclamation"></span></div>
<div v-if="ampel.bestaetigt"><span class="badge bg-success ms-1"><i class="fa fa-solid fa-circle-check"></i></span></div>
</div>
<a :href="'#ampelCollapse_' + ampel.ampel_id" data-bs-toggle="collapse" class="stretched-link">{{ ampel.kurzbz }}</a><br>
</div>
<div class="collapse my-3" :id="'ampelCollapse_' + ampel.ampel_id" :ref="'ampelCollapse_' + ampel.ampel_id">
<div v-html="ampel.beschreibung_trans"></div>
<div v-if="!ampel.bestaetigt " class="d-flex justify-content-end mt-3">
<button class="btn btn-sm btn-primary" :class="{disabled: ampel.bestaetigt}" @click="confirm(ampel.ampel_id)">{{ validateBtnTxt(ampel.buttontext_trans) }}</button>
</div>
</div>
</li>
</ul>
</div>
</template>
</BaseOffcanvas>`
<!-- All Ampeln Offcanvas -->
<BaseOffcanvas id="allAmpelOffcanvas" :closeFunc="closeOffcanvas">
<template #title><header><b>{{$p.t('ampeln','allMyAmpeln')}}</b></header></template>
<template #body>
<div class="d-flex justify-content-evenly">
<div class="form-check form-check-inline form-control-sm">
<input class="form-check-input" type="radio" v-model="source" id="offen" value="offen" checked>
<label class="form-check-label" for="offen">{{$p.t('ampeln','openAmpeln')}}</label>
</div>
<div class="form-check form-check-inline form-control-sm">
<input class="form-check-input" type="radio" v-model="source" id="alle" value="alle" >
<label class="form-check-label" for="alle">{{$p.t('ampeln','allAmpeln')}}</label>
</div>
</div>
<div class="col"><button class="btn btn-light w-100" @click="filter = ''"><small>{{$p.t('ui','alle')}}: <b>{{ count.alle }}</b></small></button></div>
<div class="row row-cols-2 g-2 mt-1">
<div class="col"><button class="btn btn-danger w-100" @click="toggleFilter('ueberfaellig')"><i class="fa fa-solid fa-bolt me-2"></i><small :class="{'text-decoration-underline':filter==='ueberfaellig', 'fw-bold':filter==='ueberfaellig'}">{{$p.t('ampeln','overdue')}}: <b>{{ count.ueberfaellig }}</b></small></button></div>
<div class="col"><button class="btn btn-warning w-100" @click="toggleFilter('verpflichtend')"><i class="fa fa-solid fa-triangle-exclamation me-2"></i><small :class="{'text-decoration-underline':filter==='ueberfaellig', 'fw-bold':filter==='ueberfaellig'}" >{{$p.t('ampeln','mandatory')}}: <b>{{ count.verpflichtend }}</b></small></button></div>
</div>
<div v-for="ampel in ampelnComputed" :key="ampel.ampel_id" class="mt-2">
<ul class="list-group">
<li class="list-group-item small">
<div class="position-relative"><!-- prevents streched-link from stretching outside this parent element -->
<div class="d-flex">
<span class="small text-muted me-auto"><small>{{$p.t('ampeln','deadline')}}: {{ getDate(ampel.deadline) }}</small></span>
<div v-if="(new Date() > new Date(ampel.deadline)) && !ampel.bestaetigt"><span class="badge bg-danger"><i class="fa fa-solid fa-bolt"></span></div>
<div v-if="ampel.verpflichtend"><span class="badge bg-warning ms-1"><i class="fa fa-solid fa-triangle-exclamation"></span></div>
<div v-if="ampel.bestaetigt"><span class="badge bg-success ms-1"><i class="fa fa-solid fa-circle-check"></i></span></div>
</div>
<a :href="'#ampelCollapse_' + ampel.ampel_id" data-bs-toggle="collapse" class="stretched-link">{{ ampel.kurzbz }}</a><br>
</div>
<div class="collapse my-3" :id="'ampelCollapse_' + ampel.ampel_id" :ref="'ampelCollapse_' + ampel.ampel_id">
<div v-html="ampel.beschreibung_trans"></div>
<div v-if="!ampel.bestaetigt " class="d-flex justify-content-end mt-3">
<button class="btn btn-sm btn-primary" :class="{disabled: ampel.bestaetigt}" @click="confirm(ampel.ampel_id)">{{ validateBtnTxt(ampel.buttontext_trans) }}</button>
</div>
</div>
</li>
</ul>
</div>
</template>
</BaseOffcanvas>`
}