root/THANASOFT-DV
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

finish fix talk message and set default talk notifications sender to Johann, WIP talk notifications, ligne Groups

Browse Source
This commit is contained in:
Tiavina 2025-01-21 11:52:06 +03:00
parent 71dbc49713
commit 5e7c667f2e
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gestion/lib/Constants/BddConstant.php
View File

@ -8,4 +8,5 @@ abstract class BddConstant
const DEFAULT_TABLE_PREFIX = "*PREFIX*";
const DEFAULT_CLIENT_GROUP_NAME = "Nom du groupe";
const DEFAULT_ADMIN_ID_NEXTCLOUD = 'admin';
const DEFAULT_ADMIN_APP_ID_NEXTCLOUD = "Johann";
}

12
gestion/lib/Db/Bdd.php
View File

@ -3199,9 +3199,9 @@ class Bdd {
if(empty($devisProducts)){
return "";
}
$productMessage = ". SOINS A FAIRE : ";
$productMessage = ". ACTE A FAIRE : ";
foreach($devisProducts as $product){
$productMessage.= html_entity_decode($product->produit_reference)." ".html_entity_decode($product->produit_description). "(".$product->quantite."), ";
$productMessage.= html_entity_decode($product->produit_reference). "(".$product->quantite."), ";
}
$productMessage = trim( $productMessage );
$productMessage = rtrim($productMessage,",");
@ -3216,7 +3216,7 @@ class Bdd {
}
$devisDate = new Datetime($devis->date);
$devisDate = $devisDate->format('d/m/Y');
$message = "NOUVEAUX SOINS: ";
$message = "NOUVEL INTERVENTION: ";
$message .= html_entity_decode($devis->nom_defunt) . ' ';
$message .= 'le '.$devisDate. ' ';
$message .= 'à '.$devis->startTime. ' ';
@ -3224,7 +3224,11 @@ class Bdd {
$productMessage = $this->getDevisTalkRoomProductSectionMessage($devis->products);
$message .= $productMessage;
$message .= ". COMMENTAIRES: ".html_entity_decode($devis->comment);
$comment = "aucun";
if(strtolower($devis->comment) != "commentaire" && $devis->comment != ""){
$comment = html_entity_decode($devis->comment);
}
$message .= ". COMMENTAIRES: ".$comment;
return $message;
}

6
gestion/lib/Db/TalkDb.php
View File

@ -160,12 +160,12 @@ class TalkDb {
}
public function createDevisTalkRoomAndReturnDevisTalkRoom($idNextCloud,$token){
$roomName = '["'.$idNextCloud.'","'.BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD.'"]';
$roomName = '["'.$idNextCloud.'","'.BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD.'"]';
$this->createDevisTalkRoom($roomName,$token);
$room = $this->getDevisTalkRoomByName($roomName);
$attendees = [
$idNextCloud,
BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD
BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD
];
$this->createDevisTalkRoomAttendeesByActors($attendees,$room['id']);
return $room;
@ -195,7 +195,7 @@ class TalkDb {
public function createDevisTalkRoomMessageAndReturnMessage($roomId,$message){
$this->createDevisTalkRoomMessage(
BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD,
BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD,
$message,
self::DEVIS_TALK_ROOM_VERB_COMMENT,
$roomId,

8
gestion/lib/Service/TalkService.php
View File

@ -49,8 +49,8 @@ class TalkService {
}
private function getUserDevisTalkRoomNames($idNextCloud){
$roomNamesCreatedByUser = '["'.$idNextCloud.'","'.BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD.'"]';
$roomNamesCreatedByAdmin = '["'.BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD.'","'.$idNextCloud.'"]';
$roomNamesCreatedByUser = '["'.$idNextCloud.'","'.BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD.'"]';
$roomNamesCreatedByAdmin = '["'.BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD.'","'.$idNextCloud.'"]';
return [
"createdByUser" => $roomNamesCreatedByUser,
"createdByAdmin" => $roomNamesCreatedByAdmin
@ -69,7 +69,7 @@ class TalkService {
}
public function sendDevisTalkNotifications(string $message,string $idNextcloud){
if($idNextcloud === BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD){
if($idNextcloud === BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD || $idNextcloud === BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD){
return true;
}
$roomNames = $this->getUserDevisTalkRoomNames($idNextcloud);
@ -80,7 +80,7 @@ class TalkService {
}
$devisMessage = $this->talkDb->createDevisTalkRoomMessageAndReturnMessage($room['id'],$message);
$this->talkDb->updateRoomLastMessage($room['id'],$devisMessage['id']);
$this->talkDb->setAttendeeLastReadMessage($room['id'],$devisMessage['id'],BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD);
$this->talkDb->setAttendeeLastReadMessage($room['id'],$devisMessage['id'],BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD);
return true;
}