From 970e950894e72b627e427b888fc52c261852f81a Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 5 Jun 2025 17:06:55 +0200
Subject: [PATCH] tune layout of new message modal, fix pagination of message
 table

---
 application/models/system/Message_model.php         |  2 +-
 public/css/Studentenverwaltung.css                  | 12 ++++++++++++
 public/js/components/Bootstrap/Modal.js             | 13 +++++++++++--
 .../components/Messages/Details/NewMessage/Modal.js |  9 ++++++---
 .../js/components/Messages/Details/TableMessages.js | 13 +++++--------
 5 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/application/models/system/Message_model.php b/application/models/system/Message_model.php
index acbe3a44c..e0a185f9b 100644
--- a/application/models/system/Message_model.php
+++ b/application/models/system/Message_model.php
@@ -292,7 +292,7 @@ class Message_model extends DB_Model
 		if (isError($count))
 			return $count;
 
-		$count = floor(current(getData($count))->count/$limit);
+		$count = ceil(current(getData($count))->count/$limit);
 		$sql = "
 			SELECT * FROM (
 				" . $sql_base . "
diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index 4c359030c..d39cfc9b1 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -145,4 +145,16 @@ html {
 }
 .override_filtercmpt_actions_style div.d-flex.align-items-baseline {
 	align-items: end !important;
+}
+
+.stv-details-details-foto img {
+	max-width: 150px;
+}
+
+.msg_preview {
+	margin-bottom: -1px;
+}
+
+.tiny-90 div.tox.tox-tinymce {
+	height: 90% !important;
 }
\ No newline at end of file
diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js
index 2b3223ff7..af81e469f 100644
--- a/public/js/components/Bootstrap/Modal.js
+++ b/public/js/components/Bootstrap/Modal.js
@@ -23,9 +23,17 @@ export default {
 		},
 		noCloseBtn: Boolean,
 		dialogClass: [String,Array,Object],
+		headerClass: {
+			type: [String,Array,Object],
+			default: ''
+		},
 		bodyClass: {
 			type: [String,Array,Object],
 			default: 'px-4 py-5'
+		},
+		footerClass: {
+			type: [String,Array,Object],
+			default: ''
 		}
 	},
 	emits: [
@@ -117,15 +125,16 @@ export default {
 	template: `<div ref="modal" class="bootstrap-modal modal" tabindex="-1" @[\`hide.bs.modal\`]="$emit('hideBsModal')" @[\`hidden.bs.modal\`]="$emit('hiddenBsModal')" @[\`hidePrevented.bs.modal\`]="$emit('hidePreventedBsModal')" @[\`show.bs.modal\`]="$emit('showBsModal')" >
 		<div class="modal-dialog" :class="dialogClass">
 			<div class="modal-content">
-				<div v-if="$slots.title" class="modal-header">
+				<div v-if="$slots.title" class="modal-header" :class="headerClass">
 					<h5 class="modal-title"><slot name="title"/></h5>
 					<slot name="popoutButton"></slot>
 					<button v-if="!noCloseBtn" type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+					<slot name="modal-header-content"></slot>
 				</div>
 				<div class="modal-body" :class="bodyClass">
 					<slot></slot>
 				</div>
-				<div v-if="$slots.footer" class="modal-footer">
+				<div v-if="$slots.footer" class="modal-footer" :class="footerClass">
 					<slot name="footer"/>
 				</div>
 			</div>
diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index ab56f4a38..3503cbeb9 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -342,6 +342,7 @@ export default {
 			class="messages-detail-newmessage-modal"
 			ref="modalNewMessage" 
 			dialog-class=" modal-dialog-scrollable modal-xl modal-msg"
+			header-class="flex-wrap pb-0"
 			body-class="px-3 py-2"
 			@hidden.bs.modal="resetForm"
 			>
@@ -350,7 +351,8 @@ export default {
 				{{ $p.t('messages', 'neueNachricht') }}
 			</template>
 
-			<ul class="nav nav-tabs" id="msg_preview" role="tablist">
+			<template #modal-header-content>
+			<ul class="nav nav-tabs w-100 mt-3 msg_preview" id="msg_preview" role="tablist">
 				<li class="nav-item" role="presentation">
 					<button class="nav-link active" id="msg-tab" data-bs-toggle="tab" data-bs-target="#msg" type="button" role="tab" aria-controls="msg" aria-selected="true">Nachricht</button>
 				</li>
@@ -358,6 +360,7 @@ export default {
 					<button class="nav-link" id="preview-tab" data-bs-toggle="tab" data-bs-target="#preview" type="button" role="tab" aria-controls="preview" aria-selected="false">Vorschau</button>
 				</li>
 			</ul>
+			</template>
 
 			<form-form ref="formNewMassage">
 
@@ -366,7 +369,7 @@ export default {
 
 				<div class="row">
 					<div class="col-sm-8">
-						<form-form class="row g-3 mt-2" ref="formMessage">
+						<form-form class="row g-3 mt-2 h-100" ref="formMessage">
 
 							<div class="row mb-3">
 
@@ -391,7 +394,7 @@ export default {
 							</div>
 
 							<!--Tiny MCE-->
-							<div class="row mb-3">
+							<div class="row mb-3 h-100 tiny-90">
 								<form-input
 									ref="editor"
 									:label="$p.t('global','nachricht')  + ' *'"
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index ac3d616ec..878cdbfbb 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -207,12 +207,14 @@ export default {
 							this.previewBody = body;
 					}
 				},
+/*
 				{
 					event: 'pageLoaded',
 					handler: (pageno) => {
 						this.pageNo = pageno+1;
 					}
 				}
+*/
 			],
 			previewBody: "",
 			open: false,
@@ -288,16 +290,11 @@ export default {
 			// to avoid endless loop
 			if (iteration > messages.length) break;
 			}
-		return {data: messageNested, last_page};
+		return {data: messageNested, last_page: last_page};
 		},
-		loadAjaxCall(params){
+		loadAjaxCall(url, config, params){
 			return this.$api.call(
-				ApiMessages.getMessages({
-					id: this.id,
-					type: this.typeId,
-					size: this.tabulatorOptions.paginationSize,
-					page: this.pageNo
-				})
+				ApiMessages.getMessages(params)
 			);
 		}
 	},