peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
Eudes Inácio
2021-06-10 16:54:04 +01:00
parent 6164544759 5e103428ad
commit a5e3e96617
33 changed files with 360 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/home/home-routing.module.ts
+10 -2
View File
@@ -27,6 +27,10 @@ const routes: Routes = [
path:':eventId/:caller',
loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),
},
{
path:':SerialNumber/:caller',
loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module').then(m => m.ExpedienteDetailPageModule),
},
]
},
{
@@ -75,11 +79,11 @@ const routes: Routes = [
},
{
path:':eventId/:caller',
loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),
loadChildren: () => import('../pages/agenda/view-event/view-event.module').then( m => m.ViewEventPageModule),
},
{
path: 'eventId/:caller',
loadChildren: () => import('../pages/agenda/view-event/view-event.module').then( m => m.ViewEventPageModule)
loadChildren: () => import('../pages/agenda/view-event/view-event.module').then( m => m.ViewEventPageModule),
},
{
path: 'edit-event',
@@ -113,6 +117,10 @@ const routes: Routes = [
path:':SerialNumber',
loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module').then(m => m.ExpedienteDetailPageModule)
},
{
path:':SerialNumber/:caller',
loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module').then(m => m.ExpedienteDetailPageModule)
},
{
path:'events/:eventId/:caller',
loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),
src/app/pages/agenda/agenda.page.html
+13 -15
View File
@@ -46,12 +46,12 @@
</ion-row>
<ion-row class="ion-align-items-center">
<button *ngIf="profile == 'mdgpr' " (click)="changeProfile()" class="right-icons d-md-none btn-no-color">
<ion-icon src="assets/images/icons-profile-calendar-md.svg">ddddddd</ion-icon>
<button *ngIf="profile == 'mdgpr' " (click)="changeProfile()" class="d-md-none btn-no-color">
<ion-icon class="right-icons" src="assets/images/icons-profile-calendar-md.svg"></ion-icon>
</button>
<button *ngIf="profile == 'pr' " (click)="changeProfile()" class="btn-no-color">
<ion-icon class="right-icons d-md-none" src="assets/images/icons-profile-calendar-pr.svg">dddddddd</ion-icon>
<ion-icon class="right-icons d-md-none" src="assets/images/icons-profile-calendar-pr.svg"></ion-icon>
</button>
<button class="btn-no-color" (click)="viewEventsToApprove()" *ngIf="loggeduser.Profile == 'MDGPR'">
@@ -109,14 +109,12 @@
</ng-template>
</div>
</div>
<div class="calendar-border">
</div>
<!-- Calendar currente date -->
<ion-row class="timeline-header ion-justify-content-between ion-align-items-center currente-date-timelien pb-5">
<ion-row class="timeline-date align-center">
@@ -164,16 +162,16 @@
</div>
</div>
<div class="timeline-wrapper flex-grow-1" >
<!-- Progress bar -->
<div class="timeline-wrapper flex-grow-1 height-100" >
<!-- Progress bar -->
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<!-- Timeline -->
<div>
<div class="timeline-container d-flex py-20" >
<div class="height-100">
<div class="timeline-container height-100 d-flex pt-20 pl-20" >
<!-- <div [ngSwitch]="view" class="ss-timeline timeline-mobile flex-grow-1 d-md-none">
<mwl-calendar-day-view
@@ -215,10 +213,10 @@
</div>
</div> -->
<div class="ss-timeline timeline-mobile flex-grow-1 d-md-none text-black pl-20" >
<div class="ss-timeline hide-scroll timeline-mobile flex-grow-1 d-md-none text-black height-100 overflow-y-auto" >
<div *ngFor="let events of TimelineMDList | keyvalue;" >
<div >
<div *ngIf="CalendarCurrentDay <= events.key">
<div class="day mt-10">
{{ TimelineDayEvent(events.key)}}
</div>
@@ -256,10 +254,10 @@
</div>
</div>
<div class="fs-timeline flex-grow-1 d-none d-md-block d-md-block text-black pl-20 pr-20" *ngIf="loggeduser.Profile == 'MDGPR'">
<div class="fs-timeline hide-scroll flex-grow-1 d-none d-md-block d-md-block text-black pr-20 height-100 mr-md-20 overflow-y-auto" *ngIf="loggeduser.Profile == 'MDGPR'">
<div *ngFor="let events of TimelineMDList | keyvalue;" >
<div >
<div *ngIf="CalendarCurrentDay <= events.key">
<div class="day mt-10">
{{ TimelineDayEvent(events.key)}}
</div>
@@ -294,10 +292,10 @@
</div>
</div>
<div class="sd-timeline flex-grow-1 d-none d-md-block timeline-md text-black pr-20" >
<div class="sd-timeline hide-scroll flex-grow-1 d-none d-md-block timeline-md text-black pr-20 height-100 overflow-y-auto" >
<div *ngFor="let events of TimelinePRList | keyvalue;">
<div >
<div *ngIf="CalendarCurrentDay <= events.key">
<div class="day mt-10">
{{ TimelineDayEvent(events.key)}}
src/app/pages/agenda/agenda.page.scss
+3 -6
View File
@@ -605,8 +605,8 @@ td.monthview-primary-with-event {
.timeline-wrapper{
width: 100%;
overflow: scroll;
overflow-x: hidden;
overflow: auto;
// overflow-x: hidden;
}
}
}
@@ -698,7 +698,4 @@ app-approve-event{
display: flex;
align-items: center;
height: 100%;
}
}
src/app/pages/agenda/agenda.page.ts
+13 -4
View File
@@ -253,8 +253,10 @@ export class AgendaPage implements OnInit {
//Show information of the event
async onEventSelected(ev: { event: Event}){
this.viewEventDetail(ev.event.EventId);
/* this.router.navigate(["/home/agenda", ev.event.EventId, 'agenda']); */
/* this.viewEventDetail(ev.event.EventId); */
console.log('DOVE');
this.router.navigate(["/home/agenda", ev.event.EventId, 'agenda']);
}
onCurrentChanged = (ev: Date) => {
@@ -376,6 +378,12 @@ export class AgendaPage implements OnInit {
}
get CalendarCurrentDay () {
console.log(this.viewDate.getDate(), '0_0')
return this.viewDate.getDate()
}
// for timeline
timelineIsCurrentDate(): Boolean {
return momentG(new Date(),'dd MMMM yyyy', 'pt') == momentG(this.eventSelectedDate,'dd MMMM yyyy', 'pt');
@@ -1206,7 +1214,8 @@ export class AgendaPage implements OnInit {
// open component
async viewEventDetail(eventId:any) {
console.log(this.profile);
this.router.navigate(['/home/agenda', eventId, 'agenda']);
/* console.log(this.profile);
const modal = await this.modalCtrl.create({
component: ViewEventPage,
@@ -1222,7 +1231,7 @@ export class AgendaPage implements OnInit {
if(res){
// this.viewEventDetailDismiss(res);
}
});
}); */
}
// open component
src/app/pages/agenda/edit-event/edit-event.page.html
+4 -4
View File
@@ -136,7 +136,7 @@
<div class="container-div width-100">
<div class="ion-item-class-2">
<div (click)="addParticipants()" class="ion-item-class-2 cursor-pointer">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
</div>
@@ -149,7 +149,7 @@
</ion-list>
</ion-item>
</div>
<div class="add-people cursor-pointer" (click)="addParticipants();showAttendees=true">
<div class="add-people">
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
</div>
</div>
@@ -157,7 +157,7 @@
</div>
<div class="container-div width-100">
<div class="ion-item-class-2">
<div (click)="addParticipantsCC()" class="ion-item-class-2 cursor-pointer">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
</div>
@@ -170,7 +170,7 @@
</ion-list>
</ion-item>
</div>
<div class="add-people cursor-pointer" (click)="addParticipantsCC();showAttendees=true">
<div class="add-people">
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
</div>
</div>
src/app/pages/agenda/edit-event/edit-event.page.ts
+29 -24
View File
@@ -93,6 +93,9 @@ export class EditEventPage implements OnInit {
this.modalController.dismiss();
}
}
if(window.innerWidth > 800){
this.showAttendees=true;
}
}
@@ -128,33 +131,36 @@ export class EditEventPage implements OnInit {
}
async openAttendees() {
if(window.innerWidth > 801){
this.showAttendees=true;
}
else{
const modal = await this.modalController.create({
component: AttendeesPage,
componentProps: {
adding: this.adding,
taskParticipants: this.taskParticipants,
taskParticipantsCc: this.taskParticipantsCc
},
cssClass: 'attendee',
backdropDismiss: false
});
await modal.present();
const modal = await this.modalController.create({
component: AttendeesPage,
componentProps: {
adding: this.adding,
taskParticipants: this.taskParticipants,
taskParticipantsCc: this.taskParticipantsCc
},
cssClass: 'attendee',
backdropDismiss: false
});
modal.onDidDismiss().then((data) => {
if(data){
data = data['data'];
await modal.present();
const newAttendees: EventPerson[] = data['taskParticipants'];
const newAttendeesCC: EventPerson[] = data['taskParticipantsCc'];
modal.onDidDismiss().then((data) => {
if(data){
data = data['data'];
const newAttendees: EventPerson[] = data['taskParticipants'];
const newAttendeesCC: EventPerson[] = data['taskParticipantsCc'];
this.setIntervenient(newAttendees);
this.setIntervenientCC(newAttendeesCC);
}
});
this.setIntervenient(newAttendees);
this.setIntervenientCC(newAttendeesCC);
}
});
}
}
@@ -170,7 +176,6 @@ export class EditEventPage implements OnInit {
addParticipants(){
this.adding = 'intervenient'
this.openAttendees();
}
src/app/pages/agenda/view-event/view-event.module.ts
+5 -1
View File
@@ -9,6 +9,8 @@ import { ViewEventPageRoutingModule } from './view-event-routing.module';
import { ViewEventPage } from './view-event.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
import { HeaderPageModule } from 'src/app/shared/header/header.module';
import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
@NgModule({
imports: [
@@ -16,7 +18,9 @@ import { ComponentsModule } from 'src/app/components/components.module';
FormsModule,
IonicModule,
ComponentsModule,
ViewEventPageRoutingModule
ViewEventPageRoutingModule,
HeaderPageModule,
BtnModalDismissPageModule,
],
declarations: [ViewEventPage]
})
src/app/pages/agenda/view-event/view-event.page.html
+6 -33
View File
@@ -1,33 +1,6 @@
<!-- <ion-menu autoHide="false" side="end" content-id="main-content" >
<ion-header>
<ion-toolbar translucent>
<ion-title>Menu</ion-title>
</ion-toolbar>
</ion-header>
<ion-content>
<ion-list>
<ion-item (click)="openExpedientActionsModal('0')">
<ion-icon name="documents" slot="start"></ion-icon>
<ion-label>Efectuar Despacho</ion-label>
</ion-item>
<ion-item (click)="openExpedientActionsModal('1')">
<ion-icon name="arrow-undo" slot="start"></ion-icon>
<ion-label>Pedido de Parecer</ion-label>
</ion-item>
<ion-item (click)="openExpedientActionsModal('2')">
<ion-icon name="arrow-redo" slot="start"></ion-icon>
<ion-label>Pedido de Deferimento</ion-label>
</ion-item>
<ion-item (click)="openBookMeetingModal()">
<ion-icon name="calendar" slot="start"></ion-icon>
<ion-label>Marcar reunião</ion-label>
</ion-item>
</ion-list>
</ion-content>
</ion-menu>
<div class="ion-page d-none" id="main-content">
<ion-menu-button></ion-menu-button>
</div> -->
<ion-header class="ion-no-border">
<app-header></app-header>
</ion-header>
<ion-content class="height-100">
<div class="main-content d-flex height-100">
@@ -42,7 +15,7 @@
<div class="middle d-flex align-center flex-grow-1">
<ion-label class="title">{{loadedEvent.Subject}}</ion-label>
</div>
<div class="div-icon d-flex align-base">
<div class="menu-options d-flex align-base">
<button class="btn-no-color" (click)="editEvent()">
<ion-icon class="edit" slot="end" src="assets/images/icons-edit.svg" ></ion-icon>
</button>
@@ -84,8 +57,8 @@
<ion-item lines="none" class="ion-no-margin ion-no-padding">
<div disabled class="width-100" [innerHTML]="loadedEvent.Body.Text" rows="6"></div>
</ion-item>
<div class="line"></div>
</div>
<div class="line"></div>
</div>
<div *ngIf="loadedAttachments" class="bottom-content width-100">
@@ -114,7 +87,7 @@
</div>
</div>
<div class="aside-right flex-column height-100 d-none d-md-flex">
<div class="aside-right flex-column height-100">
<div class="buttons">
<button (click)="editEvent()" full class="btn-ok" shape="round" >Editar</button>
<div class="solid"></div>
src/app/pages/agenda/view-event/view-event.page.scss
+49 -9
View File
@@ -1,3 +1,4 @@
@import '~src/function.scss';
ion-content{
--background:transparent;
/* --padding-top:0px;
@@ -15,7 +16,6 @@ ion-menu{
.main-header{
font-family: Roboto;
background-color: #fff;
overflow:hidden;
color:#000;
transform: translate3d(0, 1px, 0);
@@ -28,7 +28,6 @@ ion-menu{
width: 37px;
float: left;
font-size: 35px;
overflow: hidden;
}
.middle{
//width: 230px;
@@ -41,15 +40,15 @@ ion-menu{
font-size: 45px;
float: right;
}
.div-icon{
.menu-options{
float: right;
padding: 1px;
}
.div-icon .edit{
.menu-options .edit{
font-size: 35px;
float: left;
}
.div-icon .delete{
.menu-options .delete{
padding: 7px;
font-size: 21px;
color:#fff;
@@ -66,8 +65,9 @@ ion-menu{
}
.main-content{
font-family: Roboto;
margin: 0 auto;
background-color: #fff;
background-color: #fff !important;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
overflow:auto;
.content{
@@ -206,7 +206,6 @@ ion-menu{
width: 37px;
float: right;
font-size: 35px;
overflow: hidden;
}
}
.buttons{
@@ -234,4 +233,45 @@ ion-menu{
textarea{
border:none;
--background:#fff !important;
}
}
@media only screen and (max-width: 800px) {
.content{
width: 100% !important;
}
.aside-right{
display: none;
}
}
@media only screen and (min-width: 801px) {
.menu-options{
display: none !important;
}
.content{
width: 65%;
border-right: 1px solid #d8d8d8;
}
.aside-right{
width: 35%;
}
}
@media only screen and (min-width: 1024px){
.content{
width: 70%;
}
.aside-right{
width: 30%;
}
}
@media only screen and (min-width: 1140px){
.content{
width: 75%;
}
.aside-right{
width: 25%;
}
}
src/app/pages/agenda/view-event/view-event.page.ts
+17 -8
View File
@@ -12,6 +12,7 @@ import { ProcessesService } from 'src/app/services/processes.service';
import { ExpedientTaskModalPage } from '../../gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
import { BookMeetingModalPage } from '../../gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
import { ActivatedRoute } from '@angular/router';
@Component({
selector: 'app-view-event',
@@ -43,21 +44,25 @@ export class ViewEventPage implements OnInit {
constructor(
private modalController: ModalController,
private navParams: NavParams,
/* private navParams: NavParams, */
private eventsService: EventsService,
private attachmentsService: AttachmentsService,
public alertController: AlertController,
private iab: InAppBrowser,
private processes: ProcessesService,
public popoverController: PopoverController
public popoverController: PopoverController,
private activatedRoute: ActivatedRoute,
)
{
this.profile = this.navParams.get('profile');
this.isEventEdited = false;
this.loadedEvent = new Event();
this.eventBody = { BodyType : "1", Text : ""};
this.loadedEvent.Body = this.eventBody;
this.eventId = this.navParams.get('eventId');
/* this.eventId = this.navParams.get('eventId'); */
this.activatedRoute.paramMap.subscribe(paramMap =>{
this.eventId = paramMap['params'].eventId;
});
}
@@ -111,10 +116,14 @@ export class ViewEventPage implements OnInit {
}
getAttachments(){
this.attachmentsService.getAttachmentsById(this.eventId).subscribe(res=>{
this.loadedAttachments = res;
console.log(res);
});
try {
this.attachmentsService.getAttachmentsById(this.eventId).subscribe(res=>{
this.loadedAttachments = res;
console.log(res);
});
} catch (error) {
}
}
async editEventDetail() {
src/app/pages/events/events.page.html
+1 -1
View File
@@ -57,7 +57,7 @@
<div class="content">
<ion-list>
<ion-item class="cursor-pointer" lines="none" *ngFor="let event of eventsList"
(click)="viewEventDetail(event.EventId)"
(click)="goToEvent(event.EventId)"
>
<div class="d-flex content-{{profile}}-{{event.CalendarName}}">
<div class="schedule-time">
src/app/pages/events/events.page.ts
+12 -3
View File
@@ -272,6 +272,16 @@ export class EventsPage implements OnInit {
});
}
goToEvent(eventId:any){
let navigationExtras: NavigationExtras = {
queryParams: {
"eventId": eventId,
"caller": "agenda"
}
};
this.router.navigate(['/home/agenda', eventId, 'events']);
}
async viewEventDetail(eventId:any) {
let classs;
if( window.innerWidth <= 800){
@@ -284,7 +294,6 @@ export class EventsPage implements OnInit {
component: ViewEventPage,
componentProps:{
eventId: eventId,
profile: this.profile,
},
cssClass: classs,
});
@@ -329,10 +338,10 @@ export class EventsPage implements OnInit {
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
"from": "inicio"
"caller": "agenda"
}
};
this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);
this.router.navigate(['/home/gabinete-digital/expediente', serialNumber, 'events']);
}
async viewExpedientDetail(serialNumber:any) {
src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
+1 -4
View File
@@ -295,10 +295,7 @@ export class DespachosPrPage implements OnInit {
await modal.present();
modal.onDidDismiss().then(res=>{
if(res['data']=='close'){
// this.close();
/* console.log('2Expedient Discard closed2');
this.close();
this.openMenu(); */
}
});
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
+2 -2
View File
@@ -81,7 +81,7 @@
<button (click)="emendTask(loadedEvent.serialNumber)" class="btn-cancel" shape="round" >Adicionar Nota</button>
<div class="solid"></div>
<button full class="btn-cancel" shape="round" (click)="editar(loadedEvent.serialNumber)" >Editar</button>
<button (click)="rejectTask(loadedEvent.serialNumber)" full class="btn-delete" shape="round" >Rejeitar</button>
<button (click)="rejeitar(loadedEvent.serialNumber)" full class="btn-delete" shape="round" >Rejeitar</button>
</div>
</div>
@@ -95,7 +95,7 @@
<ion-icon name="ellipsis-vertical-outline"></ion-icon>
</ion-menu-button>
<button class="btn-ok" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
<button hidden class="btn-delete" shape="round" (click)="rejectTask(loadedEvent.serialNumber)">Rejeitar</button>
<button hidden class="btn-delete" shape="round" (click)="rejeitar(loadedEvent.serialNumber)">Rejeitar</button>
</div>
</ion-footer>
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+13 -7
View File
@@ -50,6 +50,7 @@ export class ApproveEventPage implements OnInit {
private animationController: AnimationController,
private toastService: ToastService,
) {
this.activatedRoute.queryParams.subscribe(params => {
if(params["serialNumber"]) {
this.serialNumber = params["serialNumber"];
@@ -69,7 +70,11 @@ export class ApproveEventPage implements OnInit {
"eventos": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
if( window.innerWidth < 801) {
this.router.navigate(['/home/gabinete-digital/event-list']);
} else {
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
}
@@ -89,9 +94,9 @@ export class ApproveEventPage implements OnInit {
async approveTask(serialNumber:string) {
let body = { "serialNumber": serialNumber, "action": "Aprovar" }
console.log(body);
try {
await this.processes.PostTaskAction(body).toPromise()
//await this.processes.PostTaskAction(body).toPromise()
//this.successMessage()
this.toastService.successMessage('Evento aprovado', ()=>{
this.goBack();
@@ -118,12 +123,13 @@ export class ApproveEventPage implements OnInit {
this.goBack();
}
async rejectTask(serialNumber:string){
async rejeitar(serialNumber:string){
let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
console.log(body);
this.successMessage('Process');
try {
this.processes.PostTaskAction(body).toPromise();
//await this.successMessage('Processo rejeitado');
await this.successMessage('Processo rejeitado');
await this.toastService.successMessage('Processo rejeitado', ()=>{
this.goBack();
});
@@ -202,14 +208,14 @@ export class ApproveEventPage implements OnInit {
});
}
/* goToEventsToApprove(){
goToEventsToApprove(){
let navigationExtras: NavigationExtras = {
queryParams: {
"eventos": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
} */
}
async editar(serialNumber: string) {
src/app/pages/gabinete-digital/event-list/event-list.page.html
+1 -1
View File
@@ -57,7 +57,7 @@
<div *ngIf="eventsPRList">
<ion-item-sliding>
<ion-item class="Rectangle cursor-pointer" lines="none"
*ngFor="let event of eventsPRList" (click)="openApproveModal(event.serialNumber, event)">
*ngFor="let event of eventsPRList" (click)="goToEventDetail(event)">
<div class="content-pr-{{event.workflowInstanceDataFields.Agenda}} width-100">
<div class="approve-event-time">
<p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+34 -43
View File
@@ -35,6 +35,7 @@ export class ExpedienteDetailPage implements OnInit {
fulltask: any;
eventsList: Event[];
serialnumber: string;
serialNumber: string;
profile: string;
intervenientes: any;
cc: any = [];
@@ -42,7 +43,8 @@ export class ExpedienteDetailPage implements OnInit {
hideSendToPendentes = true
constructor(private activateRoute: ActivatedRoute,
constructor(
private activateRoute: ActivatedRoute,
private processes: ProcessesService,
private iab: InAppBrowser,
private attachments: AttachmentsService,
@@ -57,14 +59,11 @@ export class ExpedienteDetailPage implements OnInit {
private animationController: AnimationController
) {
this.activatedRoute.queryParams.subscribe(params => {
if(params["serialNumber"]) {
this.serialnumber = params["serialNumber"];
}
this.activateRoute.paramMap.subscribe(params => {
console.log(params["params"]);
if(params["type"] == "pendentes") {
this.hideSendToPendentes = false
if(params["params"].SerialNumber) {
this.serialnumber = params["params"].SerialNumber;
}
});
@@ -75,9 +74,11 @@ export class ExpedienteDetailPage implements OnInit {
this.profile = "mdgpr";
this.activateRoute.paramMap.subscribe(paramMap => {
if (!paramMap.has('SerialNumber')) {
if (!paramMap["params"].SerialNumber) {
return;
}
console.log(paramMap);
/* this.serialnumber = paramMap.get('SerialNumber'); */
this.LoadTaskDetail(this.serialnumber);
this.LoadRelatedEvents(this.serialnumber);
@@ -94,37 +95,27 @@ export class ExpedienteDetailPage implements OnInit {
this.toastService.presentToast('Não foi possível fazer login"');
}
goBack() {
this.activatedRoute.queryParams.subscribe(params => {
if(params["from"] == "inicio") {
this.router.navigate(['/home/events']);
} else {
let navigationExtras: NavigationExtras = {
queryParams: {
"expedientes": true,
}
}
if( window.innerWidth < 801) {
this.router.navigate(['/home/gabinete-digital/expediente']);
} else {
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
}
});
this.activatedRoute.paramMap.subscribe(params => {
switch (params["params"].caller) {
case 'events':
this.router.navigate(['/home',params["params"].caller]);
break;
case 'gabinete-digital':
let navigationExtras: NavigationExtras = {
queryParams: {
"expedientes": true,
}
}
if( window.innerWidth < 801) {
this.router.navigate(['/home/gabinete-digital/expediente']);
} else {
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
break;
}
});
}
sendExpedienteToPending(){
@@ -140,6 +131,7 @@ export class ExpedienteDetailPage implements OnInit {
async LoadTaskDetail(serial: string) {
this.processes.GetTask(serial).subscribe(res => {
console.log(res);
@@ -178,6 +170,9 @@ export class ExpedienteDetailPage implements OnInit {
})
});
}
async LoadRelatedEvents(serial: string) {
@@ -289,16 +284,12 @@ export class ExpedienteDetailPage implements OnInit {
} catch (error) {
this.badRequest('Processo não descartado')
}
this.goBack();
}
else if(res['data'] == 'No'){
console.log('Update');
try {
await this.processes.UpdateTaskStatus(this.task.FolderId);
await this.processes.UpdateTaskStatus(this.task.FolderId).toPromise();
this.successMessage();
this.goBack();
} catch (error) {
src/app/pages/gabinete-digital/expediente/expediente.page.ts
+2 -3
View File
@@ -98,12 +98,11 @@ export class ExpedientePage implements OnInit {
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
"from": "gabinete",
"type": "pendentes"
"caller": "gabinete"
}
}
this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);
this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']);
}
src/app/pages/gabinete-digital/gabinete-digital.page.scss
+3 -3
View File
@@ -8,8 +8,8 @@ ion-content{
}
:host{
// background: #0782c9;
ion-card-title{
text-align: center;
ion-card-title {
text-align: center;
}
.title-container{
padding: 30px 20px 0 20px !important;
@@ -81,7 +81,7 @@ ion-content{
/* NEW CSS */
.main-content{
.main-content {
width: 100%; /* 400px */
height: 100%;
font-family: Roboto;
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+1 -1
View File
@@ -303,7 +303,7 @@ export class GabineteDigitalPage implements OnInit {
else {
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
this.showEventsToApprove = true;
this.eventsToApprove.doRefresh();
//this.eventsToApprove.doRefresh();
}
}
src/app/pages/login/login.page.scss
+4 -4
View File
@@ -116,7 +116,7 @@ ion-item{
border: 0!important;
}
/* .div-logo {
.div-logo {
background: transparent;
width: em(140px);
justify-content: center;
@@ -125,7 +125,7 @@ ion-item{
.div-logo img{
width: 100%;
margin: 0px auto;
} */
}
@@ -186,9 +186,9 @@ ion-item{
align-items: center;
justify-content: center;
background-image: url("/assets/background/auth.svg");
background-size: 596px 584px;
background-size: 686px 674px;
background-position: center;
background-position-y: 160px;
background-position-y: 110px;
background-repeat: no-repeat;
margin: auto;
}
src/app/pages/login/login.page.ts
+1
View File
@@ -77,6 +77,7 @@ export class LoginPage implements OnInit {
this.username.trim().length > 0
);
}
validatePassword() {
return (
this.password.trim().length > 0
src/app/pages/search/search.module.ts
+3 -1
View File
@@ -7,6 +7,7 @@ import { IonicModule } from '@ionic/angular';
import { SearchPageRoutingModule } from './search-routing.module';
import { SearchPage } from './search.page';
import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
/* import { ComponentsModule } from 'src/app/components/components.module'; */
/* import { TagCloudModule } from 'angular-tag-cloud-module'; */
@@ -17,7 +18,8 @@ import { SearchPage } from './search.page';
IonicModule,
/* TagCloudModule, */
/* ComponentsModule, */
SearchPageRoutingModule
SearchPageRoutingModule,
BtnModalDismissPageModule,
],
declarations: [SearchPage],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
src/app/pages/search/search.page.html
+8 -3
View File
@@ -2,8 +2,7 @@
<!-- HEADER-->
<ion-header class="ion-no-border header-main d-md-flex flex-md-row-reverse">
<ion-progress-bar type="indeterminate" class="loader" *ngIf="showLoader"></ion-progress-bar>
<div class="d-flex ion-justify-content-between">
<div class="top-box d-flex ion-justify-content-between">
<ion-form [class.d-none]="!showSearchInput">
<div class="d-flex search-input-container ion-justify-content-between" >
<div class="icon">
@@ -33,7 +32,13 @@
<div class="profile">
<ion-icon class="icon" src="assets/images/icons-profile.svg"></ion-icon>
</div>
</div>
<div class="btn-modal-dismiss">
<button class="btn-no-color" (click)="close()">
<ion-icon class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
</button>
</div>
</div>
<!-- Search drop down -->
<div class="advance-search pa-0 pt-10 flex-md-grow-1" *ngIf="showAdvanceSearch">
src/app/pages/search/search.page.scss
+21
View File
@@ -1,3 +1,9 @@
.top-box{
display: flex;
align-content: center;
align-items: center;
justify-content: center;
}
.header-main{
padding: 5px 18px;
padding-bottom: 2px;
@@ -6,6 +12,21 @@
width: 100%;
padding-right: 10px;
}
.btn-modal-dismiss{
width: 50px !important;
padding: 0 !important;
margin: 0 !important;
margin-left: 25px !important;
/* border: 1px solid red; */
btn-modal-dismiss icon{
font-size: 45px !important;
}
}
.ion-align-content-center{
align-content: center;
}
.search-input-container{
background-color: white;
border-radius: 27.5px;
src/app/shared/agenda/approve-event/approve-event.page.html
+1 -1
View File
@@ -20,7 +20,7 @@
<ion-icon src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
</div>
<div class="header-title flex-grow-1 cursor-pointer">
<label>12{{loadedEvent.workflowInstanceDataFields.Subject}} 11 </label>
<label>{{loadedEvent.workflowInstanceDataFields.Subject}} 11 </label>
</div>
<div (click)="editar(loadedEvent.serialNumber)" class="header-icon-right display-none-{{showAside}}">
<ion-icon src="assets/images/icons-edit.svg"></ion-icon>
src/app/shared/agenda/approve-event/approve-event.page.ts
+1
View File
@@ -50,6 +50,7 @@ export class ApproveEventPage implements OnInit {
private animationController: AnimationController
) {
// $$$
}
ngOnInit() {
src/app/shared/agenda/view-event/view-event.page.scss
+2 -2
View File
@@ -32,7 +32,7 @@ ion-menu{
width: 37px;
float: left;
font-size: 35px;
overflow: hidden;
}
.middle{
padding: 0 0 0 10px !important;
@@ -54,7 +54,7 @@ ion-menu{
padding: 1px !important;
top: 0 !important;
margin: 0 !important;
overflow: hidden;
}
.div-icon .edit{
font-size: 35px;
src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html
+1 -1
View File
@@ -1,4 +1,4 @@
<div class="left">
<div class="btn-modal-dismiss">
<button class="btn-no-color" (click)="close()">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
</button>
src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.scss
+1 -1
View File
@@ -1,4 +1,4 @@
.left{
.btn-modal-dismiss{
width: 37px;
float: left;
font-size: 35px;
src/app/shared/gabinete-digital/expedients/expedients.page.ts
+1 -1
View File
@@ -107,7 +107,7 @@ export class ExpedientsPage implements OnInit {
"type": "pendentes"
}
};
this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);
this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']);
}
async viewExpedientDetail(serialNumber:any) {
src/global.scss
+94 -1
View File
@@ -747,4 +747,97 @@ ion-icon{
height: fit-content;
height: 300px;
}
}
}
@media only screen and (min-width: 300px) {
::-webkit-scrollbar {
width: 5px;
}
/* Track */
::-webkit-scrollbar-track {
background: #f1f1f1;
border-radius: 5px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
-ms-border-radius: 5px;
-o-border-radius: 5px;
}
/* Handle */
::-webkit-scrollbar-thumb {
background: #888;
border-radius: 5px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
-ms-border-radius: 5px;
-o-border-radius: 5px;
}
/* Handle on hover */
::-webkit-scrollbar-thumb:hover {
background: rgb(92, 92, 92);
}
}
@media only screen and (min-width: 800px) {
::-webkit-scrollbar {
width: 10px;
}
/* Track */
::-webkit-scrollbar-track {
background: #f1f1f1;
border-radius: 5px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
-ms-border-radius: 5px;
-o-border-radius: 5px;
}
/* Handle */
::-webkit-scrollbar-thumb {
background: #888;
border-radius: 5px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
-ms-border-radius: 5px;
-o-border-radius: 5px;
}
/* Handle on hover */
::-webkit-scrollbar-thumb:hover {
background: rgb(92, 92, 92);
}
}
.hide-scroll::-webkit-scrollbar {
display: none !important;
}
/* Track */
.hide-scroll::-webkit-scrollbar-track {
display: none !important;
}
/* Handle */
.hide-scroll::-webkit-scrollbar-thumb {
display: none !important;
}
/* Handle on hover */
.hide-scroll::-webkit-scrollbar-thumb:hover {
display: none !important;
}
src/style/main.scss
+3 -3
View File
@@ -289,9 +289,9 @@
.height-lg-unset{ height: unset !important;}
@for $i from 0 through 50 {
.font-lg-#{$i} {
font-size: #{$i}px ;
}
.font-lg-#{$i} {
font-size: #{$i}px ;
}
}
@for $i from 0 through 10 {