mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-20 13:26:08 +00:00
Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer
This commit is contained in:
Eudes Inácio
@@ -228,7 +228,7 @@
|
||||
|
||||
<div class="calendar-title-container px-20 d-none d-md-flex" *ngIf="loggeduser.Profile == 'MDGPR'">
|
||||
<div class="calendar-title-description flex-grow-1 text-grey d-flex justify-center align-center">
|
||||
<div>Meu Calendário</div>
|
||||
<div>Calendário do MDGPR</div>
|
||||
</div>
|
||||
<div class="calendar-title-description text-black align-center">
|
||||
<div class="flex-grow-1 text-grey d-flex justify-center align-center">
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
Calendário do Presidente da República
|
||||
</mat-option>
|
||||
<mat-option value="MDGPR">
|
||||
Meu calendário
|
||||
Calendário do MDGPR
|
||||
</mat-option>
|
||||
|
||||
</mat-select>
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
<ion-toolbar>
|
||||
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
|
||||
<ion-segment-button value="MDGPR">
|
||||
Meu calendário
|
||||
Calendário do MDGPR
|
||||
</ion-segment-button>
|
||||
<ion-segment-button value="PR">
|
||||
Presidente da República
|
||||
|
||||
-1
@@ -1,5 +1,4 @@
|
||||
<ion-header class="ion-no-border">
|
||||
<app-header></app-header>
|
||||
</ion-header>
|
||||
|
||||
<ion-content>
|
||||
|
||||
+2
-3
@@ -1,9 +1,8 @@
|
||||
:host{
|
||||
|
||||
|
||||
}
|
||||
ion-content{
|
||||
--background: transparent;
|
||||
transform: translate3d(0, 5px, 0);
|
||||
--border-radius: 30px;
|
||||
}
|
||||
ion-footer{
|
||||
@@ -89,4 +88,4 @@
|
||||
.post-description{
|
||||
margin: 0 auto;
|
||||
margin-bottom: 35px;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -84,20 +84,21 @@ export class RoomService {
|
||||
ChatMessage = this.fix_updatedAt(ChatMessage)
|
||||
console.log('recivemessage', ChatMessage)
|
||||
|
||||
|
||||
const message = this.prepareMessage(ChatMessage)
|
||||
|
||||
if(message._updatedAt == undefined){
|
||||
message._updatedAt = new Date().getTime();
|
||||
}
|
||||
|
||||
this.lastMessage = message
|
||||
if (message.t == 'r') { this.name = message.msg }
|
||||
this.calDateDuration(ChatMessage._updatedAt)
|
||||
this.calDateDuration(message._updatedAt)
|
||||
this.messages.push(message)
|
||||
|
||||
setTimeout(() => {
|
||||
this.scrollDown()
|
||||
}, 100)
|
||||
|
||||
//this.sortService.sortDate(this.messages, '')
|
||||
|
||||
if(SessionStore.user.RochetChatUser != ChatMessage.u.username) {
|
||||
this.NativeNotificationService.sendNotificationChat({
|
||||
message: message.msg,
|
||||
@@ -182,7 +183,7 @@ export class RoomService {
|
||||
if(message._id == id) {
|
||||
messages.splice(index, 1)
|
||||
}
|
||||
|
||||
|
||||
})
|
||||
|
||||
this.storage.set('chatmsg' + this.id, messages).then((value) => {
|
||||
@@ -250,12 +251,12 @@ export class RoomService {
|
||||
open() {
|
||||
// this.typing(this.message)
|
||||
}
|
||||
|
||||
|
||||
|
||||
leave(rid?) {
|
||||
this.WsChatService.leaveRoom(this.id)
|
||||
}
|
||||
|
||||
|
||||
isJson(str) {
|
||||
try {
|
||||
JSON.parse(str);
|
||||
@@ -341,10 +342,10 @@ export class RoomService {
|
||||
|
||||
private fix_updatedAt(message) {
|
||||
if (message.result) {
|
||||
console.log('FIX UPDATE ', message.result)
|
||||
//console.log('FIX UPDATE ', message.result)
|
||||
message.result._updatedAt = message.result._updatedAt['$date']
|
||||
} else {
|
||||
// console.log('FIX UPDATE 11', message)
|
||||
//console.log('FIX UPDATE 11', message)
|
||||
message._updatedAt = message._updatedAt['$date']
|
||||
}
|
||||
return message
|
||||
|
||||
@@ -299,10 +299,10 @@ export class FileService {
|
||||
loader.remove();
|
||||
this.toastService.badRequest("Não foi possível adicionar a fotografia!");
|
||||
});
|
||||
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
@@ -386,12 +386,6 @@ export class FileService {
|
||||
accept: ['image/apng', 'image/jpeg', 'image/png']
|
||||
})
|
||||
|
||||
|
||||
setInterval(() => {
|
||||
console.log(input.value)
|
||||
}, 550)
|
||||
|
||||
|
||||
input.onchange = async () => {
|
||||
|
||||
//alert('Onchange AQUI')
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
<ion-toolbar>
|
||||
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
|
||||
<ion-segment-button value="MDGPR">
|
||||
Meu calendário
|
||||
Calendário do MDGPR
|
||||
</ion-segment-button>
|
||||
<ion-segment-button value="PR">
|
||||
Presidente da República
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
Calendário do Presidente da República
|
||||
</mat-option>
|
||||
<mat-option value="MDGPR">
|
||||
Meu calendário
|
||||
Calendário do MDGPR
|
||||
</mat-option>
|
||||
|
||||
</mat-select>
|
||||
|
||||
@@ -68,7 +68,7 @@
|
||||
</div>
|
||||
<div class="title">
|
||||
<ion-label>{{msg.u.name}}</ion-label>
|
||||
<span class="time">{{showDateDuration(msg._updatedAt)}}</span>
|
||||
<span class="time">{{showDateDuration(msg.duration)}}</span>
|
||||
</div>
|
||||
<div>
|
||||
<div *ngIf="msg.attachments" class="message-attachments">
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<ion-toolbar>
|
||||
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
|
||||
<ion-segment-button value="MDGPR">
|
||||
Meu calendário
|
||||
Calendário do MDGPR
|
||||
</ion-segment-button>
|
||||
<ion-segment-button value="PR">
|
||||
Presidente da República
|
||||
|
||||
@@ -66,7 +66,9 @@ export class ChatPopoverPage implements OnInit {
|
||||
});
|
||||
await modal.present();
|
||||
modal.onDidDismiss().then((res)=>{
|
||||
this.leaveGroup();
|
||||
if(res.data == 'success'){
|
||||
this.leaveGroup();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
"use strict";
|
||||
__webpack_require__.r(__webpack_exports__);
|
||||
/* harmony default export */ __webpack_exports__["default"] = ("<ion-header>\n <ion-toolbar>\n <ion-buttons slot=\"start\">\n <ion-back-button defaultHref=\"/gabinete-digital\"></ion-back-button>\n </ion-buttons>\n <ion-title>Eventos para Aprovação</ion-title>\n </ion-toolbar>\n <ion-toolbar>\n <ion-segment [(ngModel)]=\"segment\">\n <ion-segment-button value=\"MDGPR\">\n Meu calendário\n </ion-segment-button>\n <ion-segment-button value=\"PR\">\n Presidente da República\n </ion-segment-button>\n </ion-segment>\n </ion-toolbar>\n</ion-header>\n\n<ion-content>\n <div [ngSwitch]=\"segment\">\n <ion-list *ngSwitchCase=\"'MDGPR'\">\n <div *ngIf=\"eventsMDGPRList\">\n <ion-list>\n <ion-item-sliding>\n <ion-item class=\"Rectangle\" lines=\"none\" \n *ngFor=\"let event of eventsMDGPRList\"\n [routerLink]=\"['/home/gabinete-digital/expediente/events/', event.EventId, 'gabinete-digital/expediente/' + serialnumber]\">\n <div class=\"rectangle-content\">\n <div class=\"approve-event-time\">\n <p>08:30</p>\n <p>12:30</p>\n </div>\n <div class=\"approve-event-detail\">\n <p>Luanda | Palácio Presidencial</p>\n <h3>Reunião de Conselho de Ministros</h3>\n </div>\n </div>\n </ion-item>\n </ion-item-sliding>\n </ion-list>\n </div>\n\n </ion-list>\n <ion-list *ngSwitchCase=\"'PR'\">\n <ion-item-sliding *ngIf=\"eventsPRList\">\n <ion-item class=\"Rectangle\" lines=\"none\" \n *ngFor=\"let event of eventsPRList\" (click)=\"openApproveModal()\">\n <div class=\"rectangle-content\">\n <div class=\"approve-event-time\">\n <p>08:30</p>\n <p>12:30</p>\n </div>\n <div class=\"approve-event-detail\">\n <p>Luanda | Palácio Presidencial</p>\n <h3>Reunião de Conselho de Ministros</h3>\n </div>\n </div>\n </ion-item>\n </ion-item-sliding>\n </ion-list>\n </div>\n\n</ion-content>\n");
|
||||
/* harmony default export */ __webpack_exports__["default"] = ("<ion-header>\n <ion-toolbar>\n <ion-buttons slot=\"start\">\n <ion-back-button defaultHref=\"/gabinete-digital\"></ion-back-button>\n </ion-buttons>\n <ion-title>Eventos para Aprovação</ion-title>\n </ion-toolbar>\n <ion-toolbar>\n <ion-segment [(ngModel)]=\"segment\">\n <ion-segment-button value=\"MDGPR\">\n Calendário do MDGPR\n </ion-segment-button>\n <ion-segment-button value=\"PR\">\n Presidente da República\n </ion-segment-button>\n </ion-segment>\n </ion-toolbar>\n</ion-header>\n\n<ion-content>\n <div [ngSwitch]=\"segment\">\n <ion-list *ngSwitchCase=\"'MDGPR'\">\n <div *ngIf=\"eventsMDGPRList\">\n <ion-list>\n <ion-item-sliding>\n <ion-item class=\"Rectangle\" lines=\"none\" \n *ngFor=\"let event of eventsMDGPRList\"\n [routerLink]=\"['/home/gabinete-digital/expediente/events/', event.EventId, 'gabinete-digital/expediente/' + serialnumber]\">\n <div class=\"rectangle-content\">\n <div class=\"approve-event-time\">\n <p>08:30</p>\n <p>12:30</p>\n </div>\n <div class=\"approve-event-detail\">\n <p>Luanda | Palácio Presidencial</p>\n <h3>Reunião de Conselho de Ministros</h3>\n </div>\n </div>\n </ion-item>\n </ion-item-sliding>\n </ion-list>\n </div>\n\n </ion-list>\n <ion-list *ngSwitchCase=\"'PR'\">\n <ion-item-sliding *ngIf=\"eventsPRList\">\n <ion-item class=\"Rectangle\" lines=\"none\" \n *ngFor=\"let event of eventsPRList\" (click)=\"openApproveModal()\">\n <div class=\"rectangle-content\">\n <div class=\"approve-event-time\">\n <p>08:30</p>\n <p>12:30</p>\n </div>\n <div class=\"approve-event-detail\">\n <p>Luanda | Palácio Presidencial</p>\n <h3>Reunião de Conselho de Ministros</h3>\n </div>\n </div>\n </ion-item>\n </ion-item-sliding>\n </ion-list>\n </div>\n\n</ion-content>\n");
|
||||
|
||||
/***/ }),
|
||||
|
||||
@@ -225,4 +225,4 @@ EventListPage = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
|
||||
/***/ })
|
||||
|
||||
}]);
|
||||
//# sourceMappingURL=event-list-event-list-module.js.map
|
||||
//# sourceMappingURL=event-list-event-list-module.js.map
|
||||
|
||||
Reference in New Issue
Block a user