peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-21 13:55:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge

Browse Source
This commit is contained in:
Peter Maquiran
2022-01-03 18:47:36 +01:00
parent 6f49965e67 2e05e9410c
commit d84ed799bf
49 changed files with 1391 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/view-event/view-event.page.scss
+13 -14
View File
@@ -20,7 +20,7 @@ ion-menu{
background-color: #fff;
color:#000;
transform: translate3d(0, 1px, 0);
.title-content{
width: 100% !important;
margin: 0px auto;
@@ -95,7 +95,7 @@ ion-menu{
width: calc(100%-50px);
margin-left: 50px;
font-size: 18px;
.content-location{
width: 100%;
margin: 0 auto;
@@ -106,10 +106,10 @@ ion-menu{
width: calc(100% - 105px);
float: left;
}
}
.location-detail{
width: 210px;
font-weight: 700;
@@ -175,10 +175,10 @@ ion-menu{
font-size: 16px;
}
}
.bottom-content{
margin: 0 auto;
.bottom-content h3{
font-size: 16px;
margin: 0 0 0 10px;
@@ -214,12 +214,12 @@ ion-menu{
}
.aside-right{
padding: 30px 20px 0 20px !important;
.arrow-right{
display: flex;
justify-content: flex-end;
margin-bottom: 20px;
.arrow-right-icon{
width: 37px;
float: right;
@@ -230,11 +230,10 @@ ion-menu{
display: flex;
flex-wrap: wrap;
justify-content: space-between;
.btn-ok, .btn-cancel, .btn-delete{
height: auto !important;
font-size: 16px !important;
font-weight: 600 !important;
width: 100% !important;
margin-bottom: 10px !important;
padding: 15px !important;
@@ -269,12 +268,12 @@ ion-menu{
width: 65%;
border-right: 1px solid #d8d8d8;
}
.aside-right{
width: 35%;
}
}
@media only screen and (min-width: 1024px){
.content{
width: 70%;
@@ -283,7 +282,7 @@ ion-menu{
width: 30%;
}
}
@media only screen and (min-width: 1140px){
.content{
width: 75%;
@@ -299,4 +298,4 @@ ion-menu{
float: right;
padding: 5px 13.5px 5px 13.5px;
color: #fff;
}
}
src/app/pages/chat/chat.page.html
+43 -8
View File
@@ -44,7 +44,7 @@
<div class="width-100" [ngSwitch]="segment">
<ion-list *ngSwitchCase="'Contactos'">
<ion-item-sliding>
<div class="item item-hover width-100 d-flex ion-no-padding ion-no-margin"
<div class="item item-hover width-100 d-flex ion-no-padding ion-no-margin"
*ngFor="let dm of userDirectMessages"
[class.item-active]="dm._id == idSelected">
<div class="item-icon">
@@ -72,8 +72,9 @@
<div *ngIf="dm.lastMessage" class="item-description" [class.item-description-active]="dm._id == idSelected">
<ion-label *ngIf="dm.lastMessage">{{dm.lastMessage.msg}}</ion-label>
<ion-label *ngIf="dm.lastMessage.file">
<fa-icon icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="dm._id == idSelected"></fa-icon>
<span> {{dm.lastMessage.file.name}}</span>
<fa-icon *ngIf="dm.lastMessage.file.type != 'application/meeting'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="dm._id == idSelected"></fa-icon>
<fa-icon *ngIf="dm.lastMessage.file.type == 'application/meeting'" icon="calendar-alt" class="file-icon" [class.set-active-item-font-to-white]="dm._id == idSelected"></fa-icon>
<span> {{dm.lastMessage.file.name || dm.lastMessage.file.subject }}</span>
</ion-label>
<ion-label *ngIf="dm.lastMessage.attachments">
<div *ngIf="dm.lastMessage.attachments[0].image_url">
@@ -85,9 +86,24 @@
</div>
</div>
</ion-item-sliding>
<ion-item-sliding *ngIf="showLoader || userDirectMessages.length < 1">
<div *ngFor="let n of numSequence(8); let i = index;" class="item item-hover width-100 d-flex ion-no-padding ion-no-margin">
<div class="item-icon"><ion-icon class="icon" slot="start" src="assets/icon/icons-chat-grey.svg"></ion-icon></div>
<div class="item-content flex-grow-1 cursor-pointer">
<div class="item-title-time">
<div class="item-title"><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></div>
<div class="item-date"><ion-skeleton-text animated></ion-skeleton-text></div>
</div>
<div class="item-description d-flex align-items-center">
<fa-icon icon="file-alt" class="file-icon"></fa-icon>
<ion-skeleton-text animated style="width: 95%; margin-left:5%"></ion-skeleton-text>
</div>
</div>
</div>
</ion-item-sliding>
</ion-list>
<ion-list *ngSwitchCase="'Grupos'">
<ion-item-sliding>
<ion-item-sliding *ngIf="!showLoader">
<div *ngFor="let group of allGroups"
[class.item-active]="group._id ==idSelected"
class="item item-hover d-flex">
@@ -109,9 +125,10 @@
</div>
<div *ngIf="group.lastMessage" class="item-description d-flex align-items-center" [class.item-description-active]="group._id ==idSelected">
<div class="item-message">{{group.lastMessage.u.name}}: {{group.lastMessage.msg}} </div>
<div class="item-files" *ngIf="group.lastMessage.file">
<fa-icon icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="group._id == idSelected"></fa-icon>
<span> {{group.lastMessage.file.name}}</span>
<div class="item-files add-ellipsis" *ngIf="group.lastMessage.file">
<fa-icon *ngIf="group.lastMessage.file.type != 'application/meeting'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="group._id == idSelected"></fa-icon>
<fa-icon *ngIf="group.lastMessage.file.type == 'application/meeting'" icon="calendar-alt" class="file-icon" [class.set-active-item-font-to-white]="group._id == idSelected"></fa-icon>
<span class="item-files-title"> {{group.lastMessage.file.name || group.lastMessage.file.subject}}</span>
</div>
<div class="item-files" *ngIf="group.lastMessage.attachments">
<div *ngIf="group.lastMessage.attachments[0].image_url">
@@ -123,19 +140,37 @@
</div>
</div>
</ion-item-sliding>
<ion-item-sliding *ngIf="showLoader || allGroups.length < 1">
<div *ngFor="let n of numSequence(8); let i = index;" class="item item-hover width-100 d-flex ion-no-padding ion-no-margin">
<div class="item-icon"><ion-icon class="icon" slot="start" src="assets/icon/icons-group-chat-grey.svg"></ion-icon></div>
<div class="item-content flex-grow-1 cursor-pointer">
<div class="item-title-time">
<div class="item-title"><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></div>
<div class="item-date"><ion-skeleton-text animated></ion-skeleton-text></div>
</div>
<div class="item-description d-flex align-items-center">
<fa-icon icon="file-alt" class="file-icon"></fa-icon>
<ion-skeleton-text animated style="width: 95%; margin-left:5%"></ion-skeleton-text>
</div>
</div>
</div>
</ion-item-sliding>
</ion-list>
</div>
<!-- <button (click)="sendMsg()" style="height: 41px;">Send message</button> -->
</div>
</div>
<!-- Aside right -->
<div class="aside-content d-none flex-column height-100">
<app-empty-chat [texto]="emptyTextDescription"
class="height-100 flex-column"
[style.display]="showEmptyComponent ? 'flex' : 'none'"
#messagecontainer>
</app-empty-chat>
<app-messages class=" height-100 flex-column"
*ngIf="showMessages"
[style.display]="showMessages ? 'flex' : 'none'"
@@ -195,6 +230,7 @@
<app-new-event
[profile]=""
[roomId]="groupRoomId"
[selectedSegment]=segment
[taskParticipants]="taskParticipants"
[taskParticipantsCc]="taskParticipantsCc"
@@ -204,7 +240,6 @@
(openAttendeesComponent)="openAttendeesComponent($event)"
(cloneAllmobileComponent)="closeNewEventComponent()"
[style.display]="showNewEvent ? 'flex' : 'none'"
[roomId]="groupRoomId"
class=" height-100 flex-column">
</app-new-event>
src/app/pages/chat/chat.page.scss
+5
View File
@@ -126,6 +126,11 @@ ion-content{
}
.item-files{
float: left;
overflow: auto;
.item-files-title{
width: 100%;
}
}
}
.item-description-active{
src/app/pages/chat/chat.page.ts
+13 -13
View File
@@ -133,7 +133,7 @@ export class ChatPage implements OnInit {
this.modalController.dismiss();
}
};
this.showLoader = true;
}
ngOnInit() {
@@ -182,6 +182,10 @@ export class ChatPage implements OnInit {
});
}
numSequence(n: number): Array<number> {
return Array(n);
}
ngOnDestroy() {
this.setStatus('offline');
this.dataService.set("newGroup", false);
@@ -329,6 +333,7 @@ export class ChatPage implements OnInit {
IsRequired: "true",
}
});
this.groupRoomId = data.roomId;
this.closeAllDesktopComponents();
if (window.innerWidth < 701) {
console.log('Mobile');
@@ -390,10 +395,12 @@ export class ChatPage implements OnInit {
load() {
switch (this.segment) {
case "Contactos":
this.showLoader = true;
this.getDirectMessages();
break;
case "Grupos":
this.showLoader = true;
this.getGroups();
break;
}
@@ -410,7 +417,7 @@ export class ChatPage implements OnInit {
getDirectMessagesDB() {
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
this.storageservice.get("rooms").then((rooms) =>{
this.userDirectMessages = rooms.sort((a, b) => {
var dateA = new Date(a._updatedAt).getTime();
var dateB = new Date(b._updatedAt).getTime();
@@ -534,14 +541,10 @@ export class ChatPage implements OnInit {
}
async getDirectMessages(event?) {
this.chatService.getAllDirectMessages().subscribe(async (res: any) => {
this.showLoader = false;
this.transformDataRoomList(res.ims)
this.getDirectMessagesDB()
console.log('Chat list', res);
if (res != 200) {
@@ -553,7 +556,7 @@ export class ChatPage implements OnInit {
});
} */
//console.log(res.ims);
//console.log(this.userDirectMessages);
if (this.route.url != "/home/chat") {
@@ -569,7 +572,6 @@ export class ChatPage implements OnInit {
}
else {
//console.log('No timer!');
}
}
}
@@ -620,7 +622,7 @@ export class ChatPage implements OnInit {
})
} else {
this.sqlservice.getAllChatRoom().then((rooms: any) => {
let roomsArray = [];
rooms.forEach(element => {
let fddf = this.isJson(element.LastMessage);
@@ -708,6 +710,7 @@ export class ChatPage implements OnInit {
async getGroups(event?) {
this.result = this.chatService.getAllPrivateGroups().subscribe(async (res: any) => {
//console.log(res);
this.showLoader = false;
if (res.groups != 200) {
this.transformGroups(res.groups);
@@ -729,15 +732,12 @@ export class ChatPage implements OnInit {
if (this.segment == "Grupos" && this.showGroupMessages != true) {
await new Promise(resolve => setTimeout(resolve, 1000));
await this.getGroups();
//console.log('Timer groups list running')
}
}
}
else {
await this.getGroups();
}
});
}
src/app/pages/chat/group-messages/group-messages.page.html
+10 -1
View File
@@ -57,7 +57,7 @@
<ion-label>A conversa original mantêm-se como chat individual</ion-label>
</div>
<div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of messages; let last = last" [class.messages-list-item-wrapper-active]="msg._id == selectedMsgId">
<div *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'ru'" (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}'>
<div *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'ru' && msg.msg !=''" (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}'>
<div class="title">
<ion-label>{{msg.u.name}}</ion-label>
<span class="time">{{showDateDuration(msg._updatedAt)}}</span>
@@ -119,6 +119,15 @@
</div>
{{last ? scrollToBottom() : ''}}
</div>
<div *ngIf="msg.file" class="info-meeting">
<div *ngIf="msg.file.type == 'application/meeting'">
<ion-label class="info-meeting-small">{{msg.u.name}} criou esta reunião</ion-label><br />
<button (click)="goToEvent(msg.file.id)" class="btn-no-color info-meeting-normal"><ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label></button><br />
<ion-label class="info-meeting-medium"><ion-icon name="calendar-outline"></ion-icon> De {{showDateDuration(msg.file.start_date)}} a {{showDateDuration(msg.file.end_date)}}</ion-label><br />
<ion-label class="info-meeting-medium"><ion-icon></ion-icon><ion-icon name="location-outline"></ion-icon> {{msg.file.venue}}</ion-label><br />
</div>
{{last ? scrollToBottom() : ''}}
</div>
</div>
</div>
<ion-fab horizontal="end" vertical="bottom" slot="fixed">
src/app/pages/chat/group-messages/group-messages.page.scss
+35 -4
View File
@@ -235,6 +235,37 @@
}
}
.info-meeting{
/* width: 322px; */
width: em(422px);
background: var(--chat-alert-msg-color);
text-align: center;
font-size: 13px;
color: #262420;
padding: 10px;
margin: 10px auto;
line-height: 1.2rem;
/* margin: 15px 0px 15px 0px; */
border-radius: 8px;
.info-meeting-small{
font-size: 10px;
font-style: italic;
}
.info-meeting-medium{
font-size: 12px;
}
.info-meeting-normal{
color: #0782c9;
font-weight: 700;
text-decoration: underline;
}
.info-meeting-normal:hover{
text-decoration: underline;
color: #0782c9;
}
}
ion-footer{
padding-top: 7.5px;
padding-bottom: 7.5px;
@@ -281,7 +312,7 @@
.preview-slides {
margin-top: 20%;
background: #e6e6e6;
img {
padding-top: 20px;
padding-bottom: 20px;
@@ -299,15 +330,15 @@
.image-card {
overflow: visible;
}
.image-card {
z-index: 9;
}
.backdrop {
height: 200%;
width: 100%;
background: black;
position: absolute;
z-index: 10;
}
}
src/app/pages/chat/group-messages/group-messages.page.ts
+22
View File
@@ -22,6 +22,7 @@ import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.pag
import { ThemeService } from 'src/app/services/theme.service'
import { PreviewCameraPage } from 'src/app/modals/preview-camera/preview-camera.page';
import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
@Component({
selector: 'app-group-messages',
@@ -166,6 +167,27 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
this.currentPosition = scroll;
}
async goToEvent(eventId: any) {
let classs;
if (window.innerWidth < 701) {
classs = 'modal modal-desktop'
} else {
classs = 'modal modal-desktop showAsideOptions'
}
const modal = await this.modalController.create({
component: ViewEventPage,
componentProps: {
eventId: eventId,
},
cssClass: classs,
});
await modal.present();
modal.onDidDismiss().then((res) => {
console.log(res);
});
}
ngOnDestroy() {
window.removeEventListener('scroll', this.scrollChangeCallback, true);
}
src/app/pages/chat/messages/messages.page.html
+10 -1
View File
@@ -51,7 +51,7 @@
<div (click)="handleClick()" class="messages" #scrollMe>
<div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of messages; let last = last"
[class.messages-list-item-wrapper-active]="msg._id == selectedMsgId" >
<div (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}' (click)="openPreview(msg)">
<div (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}' (click)="openPreview(msg)" *ngIf="msg.msg !=''">
<div class="title">
<ion-label>{{msg.u.name}}</ion-label>
<span class="time">{{showDateDuration(msg._updatedAt)}}</span>
@@ -91,6 +91,15 @@
{{last ? scrollToBottom() : ''}}
</div>
</div>
<div *ngIf="msg.file" class="info-meeting">
<div *ngIf="msg.file.type == 'application/meeting'">
<ion-label class="info-meeting-small">{{msg.u.name}} criou esta reunião</ion-label><br />
<button (click)="goToEvent(msg.file.id)" class="btn-no-color info-meeting-normal"><ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label></button><br />
<ion-label class="info-meeting-medium"><ion-icon name="calendar-outline"></ion-icon> De {{showDateDuration(msg.file.start_date)}} a {{showDateDuration(msg.file.end_date)}}</ion-label><br />
<ion-label class="info-meeting-medium"><ion-icon></ion-icon><ion-icon name="location-outline"></ion-icon> {{msg.file.venue}}</ion-label><br />
</div>
{{last ? scrollToBottom() : ''}}
</div>
</div>
</div>
<ion-fab horizontal="end" vertical="bottom" slot="fixed">
src/app/pages/chat/messages/messages.page.scss
+31
View File
@@ -190,6 +190,37 @@
}
}
.info-meeting{
/* width: 322px; */
width: em(422px);
background: var(--chat-alert-msg-color);
text-align: center;
font-size: 13px;
color: #262420;
padding: 10px;
margin: 10px auto;
line-height: 1.2rem;
/* margin: 15px 0px 15px 0px; */
border-radius: 8px;
.info-meeting-small{
font-size: 10px;
font-style: italic;
}
.info-meeting-medium{
font-size: 12px;
}
.info-meeting-normal{
color: #0782c9;
font-weight: 700;
text-decoration: underline;
}
.info-meeting-normal:hover{
text-decoration: underline;
color: #0782c9;
}
}
ion-footer{
padding-top: 7.5px;
padding-bottom: 7.5px;
src/app/pages/chat/messages/messages.page.ts
+20 -1
View File
@@ -27,6 +27,7 @@ import { PreviewCameraPage } from 'src/app/modals/preview-camera/preview-camera.
import { SqliteService } from 'src/app/services/sqlite.service';
import { elementAt } from 'rxjs-compat/operator/elementAt';
import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
const IMAGE_DIR = 'stored-images';
@@ -283,7 +284,25 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
} catch (err) { }
}
async goToEvent(eventId: any) {
let classs;
if (window.innerWidth < 701) {
classs = 'modal modal-desktop'
} else {
classs = 'modal modal-desktop showAsideOptions'
}
const modal = await this.modalController.create({
component: ViewEventPage,
componentProps: {
eventId: eventId,
},
cssClass: classs,
});
await modal.present();
modal.onDidDismiss().then((res) => {
console.log(res);
});
}
onContentScrolled(e) {
this.startPosition = e.srcElement.scrollTop;
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss
+5 -6
View File
@@ -35,7 +35,7 @@
margin: 2.5px 0 0 5px;
display: flex;
align-items: center;
}
.right{
padding: 0!important;
@@ -68,7 +68,7 @@
margin: 1px;
}
}
.title{
font-size: 25px;
overflow: auto;
@@ -125,7 +125,7 @@ ion-button{
.bottom-content{
//width: 360px;
margin: 0 auto;
.bottom-content h3{
font-size: 16px;
margin: 0 0 0 10px;
@@ -166,7 +166,7 @@ ion-button{
display: flex;
justify-content: flex-end;
margin-bottom: 20px;
.arrow-right-icon{
width: 37px;
float: right;
@@ -182,7 +182,6 @@ ion-button{
.btn-ok, .btn-cancel, .btn-delete{
height: auto !important;
font-size: 16px !important;
font-weight: 600 !important;
width: 100% !important;
margin-bottom: 10px !important;
padding: 15px !important;
@@ -251,4 +250,4 @@ ion-button{
background-color: #e0e0e0;
padding-left: 4px;
}
}
}
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
+3 -4
View File
@@ -84,7 +84,7 @@ ion-button{
.bottom-content{
//width: 360px;
margin: 0 auto;
.bottom-content h3{
font-size: 16px;
margin: 0 0 0 10px;
@@ -125,7 +125,7 @@ ion-button{
display: flex;
justify-content: flex-end;
margin-bottom: 20px;
.arrow-right-icon{
width: 37px;
float: right;
@@ -141,7 +141,6 @@ ion-button{
.btn-ok, .btn-cancel, .btn-delete{
height: auto !important;
font-size: 16px !important;
font-weight: 600 !important;
width: 100% !important;
margin-bottom: 10px !important;
padding: 15px !important;
@@ -210,4 +209,4 @@ ion-button{
background-color: #e0e0e0;
padding-left: 4px;
}
}
}
src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss
+4 -5
View File
@@ -54,7 +54,7 @@ ion-content, .header-2, .main-content{
margin: 2.5px 0 0 5px;
display: flex;
align-items: center;
}
.right{
padding: 0!important;
@@ -87,7 +87,7 @@ ion-content, .header-2, .main-content{
margin: 1px;
}
}
.title{
font-size: 25px;
overflow: auto;
@@ -144,7 +144,7 @@ ion-button{
.bottom-content{
//width: 360px;
margin: 0 auto;
.bottom-content h3{
font-size: 16px;
margin: 0 0 0 10px;
@@ -185,7 +185,7 @@ ion-button{
display: flex;
justify-content: flex-end;
margin-bottom: 20px;
.arrow-right-icon{
width: 37px;
float: right;
@@ -201,7 +201,6 @@ ion-button{
.btn-ok, .btn-cancel, .btn-delete{
height: auto !important;
font-size: 16px !important;
font-weight: 600 !important;
width: 100% !important;
margin-bottom: 10px !important;
padding: 15px !important;
src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss
+4 -5
View File
@@ -36,7 +36,7 @@
margin: 2.5px 0 0 5px;
display: flex;
align-items: center;
}
.right{
padding: 0!important;
@@ -69,7 +69,7 @@
margin: 1px;
}
}
.title{
font-size: 25px;
overflow: auto;
@@ -126,7 +126,7 @@ ion-button{
.bottom-content{
//width: 360px;
margin: 0 auto;
.bottom-content h3{
font-size: 16px;
margin: 0 0 0 10px;
@@ -167,7 +167,7 @@ ion-button{
display: flex;
justify-content: flex-end;
margin-bottom: 20px;
.arrow-right-icon{
width: 37px;
float: right;
@@ -183,7 +183,6 @@ ion-button{
.btn-ok, .btn-cancel, .btn-delete{
height: auto !important;
font-size: 16px !important;
font-weight: 600 !important;
width: 100% !important;
margin-bottom: 10px !important;
padding: 15px !important;
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss
+4 -12
View File
@@ -40,12 +40,12 @@ ion-menu{
float: left;
/* overflow: auto;
width: 100%; */
border-right: 1px solid #d8d8d8;
border-right: 1px solid #d8d8d8;
.upper-content{
margin-left: 40px;
font-size: 18px;
.content-location{
margin-top: 0px !important;
width: 100%;
@@ -87,10 +87,10 @@ ion-menu{
font-size: 16px;
}
}
.bottom-content{
margin: 0 auto;
.bottom-content h3{
font-size: 16px;
margin: 0 0 0 10px;
@@ -132,13 +132,6 @@ ion-menu{
display: flex;
justify-content: flex-end;
margin-bottom: 20px;
/* .arrow-right-icon{
width: 37px;
float: right;
font-size: 35px;
overflow: hidden;
} */
}
.aside-buttons{
width: 100% !important;
@@ -149,7 +142,6 @@ ion-menu{
.btn-ok, .btn-cancel, .btn-delete{
height: auto !important;
font-size: 16px !important;
font-weight: 600 !important;
width: 100% !important;
margin-bottom: 10px !important;
padding: 15px !important;
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
-1
View File
@@ -183,7 +183,6 @@ ion-button{
.btn-ok, .btn-cancel, .btn-delete{
height: auto !important;
font-size: 16px !important;
font-weight: 600 !important;
width: 100% !important;
margin-bottom: 10px !important;
padding: 15px !important;
src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss
+4 -5
View File
@@ -37,7 +37,7 @@
margin: 2.5px 0 0 5px;
display: flex;
align-items: center;
}
.right{
padding: 0!important;
@@ -70,7 +70,7 @@
margin: 1px;
}
}
.title{
font-size: 25px;
overflow: auto;
@@ -124,7 +124,7 @@ ion-button{
.bottom-content{
//width: 360px;
margin: 0 auto;
.bottom-content h3{
font-size: 16px;
margin: 0 0 0 10px;
@@ -165,7 +165,7 @@ ion-button{
display: flex;
justify-content: flex-end;
margin-bottom: 20px;
.arrow-right-icon{
width: 37px;
float: right;
@@ -181,7 +181,6 @@ ion-button{
.btn-ok, .btn-cancel, .btn-delete{
height: auto !important;
font-size: 16px !important;
font-weight: 600 !important;
width: 100% !important;
margin-bottom: 10px !important;
padding: 15px !important;
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss
+2 -3
View File
@@ -90,7 +90,7 @@ ion-button{
.bottom-content{
//width: 360px;
margin: 0 auto;
.bottom-content h3{
font-size: 16px;
margin: 0 0 0 10px;
@@ -131,7 +131,7 @@ ion-button{
display: flex;
justify-content: flex-end;
margin-bottom: 20px;
.arrow-right-icon{
width: 37px;
float: right;
@@ -147,7 +147,6 @@ ion-button{
.btn-ok, .btn-cancel, .btn-delete{
height: auto !important;
font-size: 16px !important;
font-weight: 600 !important;
width: 100% !important;
margin-bottom: 10px !important;
padding: 15px !important;
src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
+3
View File
@@ -164,6 +164,9 @@ export class PendentesPage implements OnInit {
if (WorkflowName == 'Despacho') {
this.router.navigate(['/home/gabinete-digital/despachos', SerialNumber, 'gabinete-digital']);
}
else if (WorkflowName == 'Despacho do Presidente da República') {
this.router.navigate(['/home/gabinete-digital/despachos', SerialNumber, 'gabinete-digital']);
}
else if (WorkflowName == 'Pedido de Parecer' || WorkflowName == 'Pedido de Deferimento' || WorkflowName == 'Pedido de Parecer do Presidente') {
this.router.navigate(['/home/gabinete-digital/pedidos', SerialNumber, 'gabinete-digital']);
}
src/app/pages/login/login.page.ts
+4 -4
View File
@@ -90,13 +90,13 @@ export class LoginPage implements OnInit {
domainName: environment.domain,
BasicAuthKey: ""
}
const loader = this.toastService.loading()
let attempt = await this.authService.login(this.userattempt, {saveSession: false})
loader.remove()
if (attempt) {
if (attempt.UserId == SessionStore.user.UserId) {
@@ -104,7 +104,7 @@ export class LoginPage implements OnInit {
await this.authService.loginChat(this.userattempt);
this.getToken();
SessionStore.setInativity(true);
this.goback()
} else {
@@ -113,7 +113,7 @@ export class LoginPage implements OnInit {
window.localStorage.clear();
await this.authService.SetSession(attempt, this.userattempt);
this.changeProfileService.run()
await this.authService.loginChat(this.userattempt);
this.getToken();