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

save

Browse Source
This commit is contained in:
tiago.kayaya
2021-05-21 16:36:55 +01:00
parent 4a95f7ede0
commit d9947b39c5
18 changed files with 164 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
+8 -3
View File
@@ -1,3 +1,6 @@
<ion-header class="ion-no-border">
<app-header></app-header>
</ion-header>
<ion-menu autoHide="false" side="end" content-id="main-content">
<ion-header>
<ion-toolbar translucent>
@@ -37,9 +40,11 @@
<div class="main-content d-flex height-100">
<div class="content d-flex flex-column" *ngIf="task">
<div class="main-header">
<div class="title-content">
<app-btn-modal-dismiss></app-btn-modal-dismiss>
<div class="middle">
<div class="title-content d-flex justify-space-between">
<div class="font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
</div>
<div class="middle d-flex align-center flex-grow-1">
<ion-label class="title">{{ task.Folio}}</ion-label>
</div>
<div class="div-icon" (click)="openOptions()">
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss
+5
View File
@@ -1,4 +1,9 @@
@import '~src/function.scss';
.main-content{
background-color: #fff !important;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
}
.content{
padding: 30px 20px 0 20px !important;
margin: 0;
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
+19 -6
View File
@@ -4,10 +4,10 @@ import { AttachmentsService } from 'src/app/services/attachments.service';
import { EventsService } from 'src/app/services/events.service';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { DailyWorkTask } from '../../../../models/dailyworktask.model';
import { ActivatedRoute, Router } from '@angular/router';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { formatDate } from '@angular/common';
import { Event } from '../../../../models/event.model';
import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
import { MenuController, ModalController, PopoverController } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service';
import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
import { momentG } from 'src/plugin/momentG'
@@ -47,11 +47,15 @@ export class DespachoPrPage implements OnInit {
private menu: MenuController,
private router: Router,
private modalController: ModalController,
private navParams: NavParams,
private alertService: AlertService,
public popoverController: PopoverController) {
this.serialnumber = this.navParams.get('serialNumber');
this.profile = this.navParams.get('profile');
public popoverController: PopoverController,
private activatedRoute: ActivatedRoute,) {
this.activatedRoute.queryParams.subscribe(params => {
if(params["serialNumber"]) {
this.serialnumber = params["serialNumber"];
console.log(params["serialNumber"]);
}
});
}
ngOnInit() {
@@ -74,6 +78,15 @@ export class DespachoPrPage implements OnInit {
this.modalController.dismiss();
}
goBack(){
let navigationExtras: NavigationExtras = {
queryParams: {
"despachospr": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
async LoadTaskDetail(serial: string) {
this.processes.GetTask(serial).subscribe(res => {
src/app/pages/gabinete-digital/despachos-pr/despachos-pr.module.ts
+2
View File
@@ -7,12 +7,14 @@ import { IonicModule } from '@ionic/angular';
import { DespachosPrPageRoutingModule } from './despachos-pr-routing.module';
import { DespachosPrPage } from './despachos-pr.page';
import { SharedModule } from 'src/app/shared/shared.module';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
SharedModule,
DespachosPrPageRoutingModule
],
declarations: [DespachosPrPage]
src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html
+1
View File
@@ -1,3 +1,4 @@
<ion-header class="ion-no-border">
<div class="main-header">
<div class="thetitle">
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+9 -3
View File
@@ -1,3 +1,7 @@
<ion-header class="ion-no-border">
<app-header></app-header>
</ion-header>
<ion-menu autoHide="false" side="end" content-id="main-content">
<ion-header>
<ion-toolbar translucent>
@@ -37,9 +41,11 @@
<div class="main-content d-flex height-100">
<div class="content d-flex flex-column" *ngIf="task">
<div class="main-header">
<div class="title-content">
<app-btn-modal-dismiss></app-btn-modal-dismiss>
<div class="middle">
<div class="title-content d-flex justify-space-between">
<div class="font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
</div>
<div class="middle d-flex align-center flex-grow-1">
<ion-label class="title">{{ task.Folio}}</ion-label>
</div>
<div class="div-icon" (click)="openOptions()">
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
+5
View File
@@ -1,4 +1,9 @@
@import '~src/function.scss';
.main-content{
background-color: #fff !important;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
}
.content{
padding: 30px 20px 0 20px !important;
margin: 0;
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+21 -7
View File
@@ -4,10 +4,10 @@ import { AttachmentsService } from 'src/app/services/attachments.service';
import { EventsService } from 'src/app/services/events.service';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { DailyWorkTask } from '../../../../models/dailyworktask.model';
import { ActivatedRoute, Router } from '@angular/router';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { formatDate } from '@angular/common';
import { Event } from '../../../../models/event.model';
import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
import { MenuController, ModalController, PopoverController } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service';
import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
import { momentG } from 'src/plugin/momentG'
@@ -45,13 +45,18 @@ export class DespachoPage implements OnInit {
private attachmentsService: AttachmentsService,
private events: EventsService,
private menu: MenuController,
private router: Router,
private modalController: ModalController,
private navParams: NavParams,
private alertService: AlertService,
public popoverController: PopoverController) {
this.serialnumber = this.navParams.get('serialNumber');
this.profile = this.navParams.get('profile');
public popoverController: PopoverController,
private activatedRoute: ActivatedRoute,
private router: Router,
) {
this.activatedRoute.queryParams.subscribe(params => {
if(params["serialNumber"]) {
this.serialnumber = params["serialNumber"];
console.log(params["serialNumber"]);
}
});
}
ngOnInit() {
@@ -74,6 +79,15 @@ export class DespachoPage implements OnInit {
this.modalController.dismiss();
}
goBack(){
let navigationExtras: NavigationExtras = {
queryParams: {
"despachos": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
async LoadTaskDetail(serial: string) {
this.processes.GetTask(serial).subscribe(res => {
src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
+9 -3
View File
@@ -1,10 +1,16 @@
<ion-header class="ion-no-border">
<app-header></app-header>
</ion-header>
<ion-content>
<div class="main-content d-flex height-100">
<div class="content d-flex flex-column" *ngIf="task">
<div class="main-header">
<div class="title-content">
<app-btn-modal-dismiss></app-btn-modal-dismiss>
<div class="middle">
<div class="title-content d-flex justify-space-between">
<div class="font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
</div>
<div class="middle d-flex align-center flex-grow-1 ">
<ion-label class="title">{{ task.Folio}}</ion-label>
</div>
<div class="div-icon" (click)="openOptions()">
src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss
+5
View File
@@ -1,4 +1,9 @@
@import '~src/function.scss';
.main-content{
background-color: #fff !important;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
}
.content{
padding: 30px 20px 0 20px !important;
margin: 0;
src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
+21 -5
View File
@@ -1,11 +1,12 @@
import { Component, OnInit } from '@angular/core';
import { ModalController, NavParams, PopoverController } from '@ionic/angular';
import { ModalController, PopoverController } from '@ionic/angular';
import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
import { ProcessesService } from 'src/app/services/processes.service';
import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
import { momentG } from 'src/plugin/momentG';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
@Component({
selector: 'app-diploma',
@@ -27,19 +28,34 @@ export class DiplomaPage implements OnInit {
customDate: any
constructor(
private navParams: NavParams,
private processes: ProcessesService,
public popoverController: PopoverController,
private modalController: ModalController,
private iab: InAppBrowser,
private activatedRoute: ActivatedRoute,
private router: Router,
) {
this.serialnumber = this.navParams.get('serialNumber');
this.profile = this.navParams.get('profile');
this.activatedRoute.queryParams.subscribe(params => {
if(params["serialNumber"]) {
this.serialnumber = params["serialNumber"];
console.log(params["serialNumber"]);
}
});
this.LoadTaskDetail(this.serialnumber);
}
ngOnInit() {
this.profile = "mdgpr";
this.LoadTaskDetail(this.serialnumber);
}
goBack(){
let navigationExtras: NavigationExtras = {
queryParams: {
"diplomas": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
async openOptions(taskAction?: any) {