diff --git a/application/models/ressource/Stundensatz_model.php b/application/models/ressource/Stundensatz_model.php
index c397d8573..10f5a6aa1 100644
--- a/application/models/ressource/Stundensatz_model.php
+++ b/application/models/ressource/Stundensatz_model.php
@@ -13,5 +13,33 @@ class Stundensatz_model extends DB_Model
$this->pk = 'stundensatz_id';
$this->hasSequence = true;
}
-
+
+ public function getStundensatzByDatum($uid, $beginn, $ende = null, $typ = null)
+ {
+ $qry = "SELECT
+ *
+ FROM
+ hr.tbl_stundensatz
+ WHERE
+ uid = ?
+ AND (gueltig_bis >= ? OR gueltig_bis is null)";
+
+ $params = array($uid, $beginn);
+
+ if (!is_null($ende))
+ {
+ $qry .= " AND (gueltig_von <= ?)";
+ $params[] = $ende;
+ }
+
+ if (!is_null($typ))
+ {
+ $qry .= " AND stundensatztyp = ?";
+ $params[] = $typ;
+ }
+
+ $qry .= " ORDER BY gueltig_bis DESC NULLS FIRST, gueltig_von DESC NULLS LAST LIMIT 1;";
+
+ return $this->execQuery($qry, $params);
+ }
}
\ No newline at end of file
diff --git a/public/css/tags.css b/public/css/tags.css
index fb0c33a29..f7a2ad918 100644
--- a/public/css/tags.css
+++ b/public/css/tags.css
@@ -17,10 +17,9 @@
}
.tag_notice {
- background-color: red !important;
+ background-color: orangered !important;
}
-
.tag_finished {
background-color: green !important;
}
diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index a7d93523e..fb571407c 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -66,7 +66,8 @@ export const CoreFilterCmpt = {
uniqueId: String,
// TODO soll im master kommen?
idField: String,
- parentIdField: String
+ parentIdField: String,
+ countOnly: Boolean
},
data: function() {
return {
@@ -600,7 +601,10 @@ export const CoreFilterCmpt = {
- Mit {{selectedData.length}} ausgewählten:
+
+ {{ selectedData.length }} ausgewählt
+ Mit {{ selectedData.length }} ausgewählten:
+
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index afda422d7..7d8ff0181 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -26528,13 +26528,13 @@ array(
'phrases' => array(
array(
'sprache' => 'German',
- 'text' => 'Mitarbeiter und Projekt sind der Organisationseinheit nicht zugeordnet.',
+ 'text' => 'Info an DepL/KFL',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
- 'text' => 'Employee and project are not assigned to the organizational unit.',
+ 'text' => 'Info to DepL/KFL:',
'description' => '',
'insertvon' => 'system'
)