- tags

- phrases
- stundensatzbydatum
- filter nur count

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);
+	}
 }

public/css/tags.css

@@ -17,10 +17,9 @@
 }
 
 .tag_notice {
-	background-color: red !important;
+	background-color: orangered !important;
 }
 
-
 .tag_finished {
 	background-color: green !important;
 }

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 = {
 					<button v-if="reload" class="btn btn-outline-secondary" aria-label="Reload" @click="reloadTable">
 						<span class="fa-solid fa-rotate-right" aria-hidden="true"></span>
 					</button>
-					<span v-if="$slots.actions && tabulatorHasSelector">Mit {{selectedData.length}} ausgewählten:</span>
+					<span v-if="$slots.actions && tabulatorHasSelector">
+						<span v-if="countOnly">{{ selectedData.length }} ausgewählt</span>
+						<span v-else> Mit {{ selectedData.length }} ausgewählten:</span>
+					</span>
 					<slot name="actions" v-bind="tabulatorHasSelector ? selectedData : []"></slot>
 					<slot name="search"></slot>
 				</div>

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'
 			)