jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/message-issue' into 'main'

Browse Source 
Fix/message issue

See merge request jjimenez/safekat!424
This commit is contained in:
Alvaro
2024-12-04 17:35:30 +00:00
parent 65f179bdd8 ea4d4327b7
commit 3aaee893eb
6 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ci4/app/Controllers/Configuracion/Users.php
View File

@ -265,7 +265,7 @@ class Users extends \App\Controllers\GoBaseController
foreach ($chatDepartments as $chatDepartment) {
$this->chat_department_user_model->insert([
"user_id" => $id,
"chat_department_id" => $this->chat_department_model->where("name", $chatDepartment)->first()["id"]
"chat_department_id" => $this->chat_department_model->where("name", $chatDepartment)->first()->id
]);
}
$id = $user->id ?? $id;

3
ci4/app/Language/es/Chat.php
View File

@ -28,5 +28,6 @@ return [
"add_notification" => "Notificación",
"check_as_unviewed" => "Marcar como no leídos",
"add_notification_message" => "Envía a los usuarios añadidos una notificación con los mensajes presentes en el chat.",
"chat_title_presupuesto" => 'Presupuesto[{title,string,0}][{id}]'
"chat_title_presupuesto" => 'Presupuesto[{title,string,0}][{id}]',
"no_messages_notification" => 'No hay mensajes que revisar por el momento'
];

8
ci4/app/Views/themes/vuexy/form/user/_userFormItems.php
View File

@ -61,11 +61,11 @@
$selectedChatDepartments = isset($chatDepartmentUser) && is_array($chatDepartmentUser) ? $chatDepartmentUser : [];
$selectedKeywords = array_map(fn($chatDepartment) => $chatDepartment->name, $selectedChatDepartments);
foreach ($chatDepartments as $item) :
$isSelected = in_array($item["name"], $selectedKeywords) ? 'selected' : '';
$isSelected = in_array($item->name, $selectedKeywords) ? 'selected' : '';
?>
<option value="<?= $item["name"] ?>"
data-select2-id=<?= $item["name"] ?> <?= $isSelected ?>>
<?= $item["display"] ?>
<option value="<?= $item->name ?>"
data-select2-id=<?= $item->name ?> <?= $isSelected ?>>
<?= $item->display ?>
</option>
<?php endforeach; ?>
</select>

3
ci4/app/Views/themes/vuexy/main/defaultlayout.php
View File

@ -136,8 +136,9 @@ $picture = "/assets/img/default-user.png";
<div class="container-m-nx m-2">
<div class="sidebar-body">
<!-- Contacts -->
<h6 id="chat-message-notification-title"><?= lang("Chat.no_messages_notification") ?> </h6>
<ul class="list-unstyled chat-contact-list mb-0" id="chat-notification-list">
</ul>
</div>
</div>

2
httpdocs/assets/js/safekat/components/chat.js
View File

@ -722,9 +722,11 @@ export const showNotificationMessages = (dom) => {
dom.empty()
$("#chat-notification-number")
if (data.totalMessages > 0) {
$("#chat-message-notification-title").addClass("d-none")
$("#chat-notification-number").removeClass("d-none")
$("#chat-notification-number").text(data.totalMessages ?? 0)
} else {
$("#chat-message-notification-title").removeClass("d-none")
$("#chat-notification-number").addClass("d-none")
$("#chat-notification-number").text(0)
}

4
httpdocs/assets/js/safekat/pages/configuracion/messages/messagePage.js
View File

@ -14,7 +14,7 @@ class MessagePage {
this.formNewDirectMessage = this.modalNewMessage.item.find("#formNewDirectMessage")
this.alert = new Alert($("#alertDirectMessage"))
this.selectUsers = $("#select-users")
this.selectUsers = $("#select-departments")
this.selectDepartments = $("#select-departments")
this.selectPlaceholder = {
id: '0',
@ -25,7 +25,7 @@ class MessagePage {
text: "Seleccione un departamento"
}
this.selectMessageUsers = new ClassSelect(this.selectUsers, '/chat/users/all', this.selectPlaceholder, true)
this.selectChatDepartment = new ClassSelect(this.selectUsers, '/chat/department/select', this.selectDepartmentPlaceholder, true)
this.selectChatDepartment = new ClassSelect(this.selectDepartments, '/chat/department/select', this.selectDepartmentPlaceholder, true)
}
init() {