date format solved and intevinets text correted

This commit is contained in:
Eudes Inácio
2023-08-15 12:42:40 +01:00
22 changed files with 138 additions and 55 deletions
@@ -128,11 +128,11 @@
<span class="span-right">{{ attach.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</span>
</div>
<div (click)="docIndex(i);LoadDocumentDetails()" class="doc-options">
<!-- <div (click)="docIndex(i);LoadDocumentDetails()" class="doc-options">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
</div>
</div> -->
</ion-label>
</li>
@@ -68,7 +68,7 @@ export class ContactsPage implements OnInit {
username: username,
}
this.chatService.createRoom(body).subscribe(res => {
this.ChatSystemService.getAllRooms();
this.room = res['room'];
this.openMessage.emit(this.room._id);
});
@@ -13,6 +13,7 @@ import { ThemeService } from 'src/app/services/theme.service'
import { RouteService } from 'src/app/services/route.service';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { environment } from 'src/environments/environment';
import { TaskService } from 'src/app/services/task.service'
@Component({
selector: 'app-despachos-options',
@@ -36,6 +37,7 @@ export class DespachosOptionsPage implements OnInit {
public ThemeService: ThemeService,
private RouteService: RouteService,
private httpErrorHandle: HttpErrorHandle,
public TaskService: TaskService
) {
this.task = this.navParams.get('task')
this.fulltask = this.navParams.get('fulltask')
@@ -249,7 +251,7 @@ export class DespachosOptionsPage implements OnInit {
await this.generateDiploma(res.data.note, docs);
}
else if(actionName == 'Concluido') {
//this.concluir(res.data.note, docs);
this.concluir(res.data.note, docs);
}
else if(actionName == 'Reexecução') {
await this.reexecutar(res.data.note, docs);
@@ -261,6 +263,34 @@ export class DespachosOptionsPage implements OnInit {
});
}
async concluir(note: string, documents: any) {
let body = {
"serialNumber": this.serialNumber,
"action": "Arquivo",
"ActionTypeId": 95,
"dataFields": {
"ReviewUserComment": note,
},
"AttachmentList": documents,
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise()
this.httpErrorHandle.httpsSucessMessagge('Concluir Despacho')
this.TaskService.loadDiplomas()
} catch (error) {
this.httpErrorHandle.httpStatusHandle(error)
}
finally {
loader.remove()
}
}
async arquivar(note:string, documents:any) {
let body = {
"serialNumber": this.serialNumber,
@@ -311,8 +311,8 @@ export class DespachosPrOptionsPage implements OnInit {
async concluir(note:string, documents:any){
let body = {
"serialNumber": this.serialNumber,
"action": "Executado",
"ActionTypeId": 104,
"action": "Arquivo",
"ActionTypeId": 95,
"dataFields": {
"ReviewUserComment": note,
},
@@ -28,25 +28,11 @@
</div>
</div>
{{ capturedImage }}
{{ publication | json }}
<div class="picture d-flex pb-5 hide-desktop" *ngIf="publication.FileBase64 != 'data:image/jpg;base64,null' ">
<div class="post-img">
<img src="{{publication.FileBase64}}" alt="image" >
</div>
<div class="d-flex flex-column pl-10">
<div class="picture-file-name">{{publication.OriginalFileName}}.{{publication.FileExtension}}</div>
<div class="size">75 Kb</div>
</div>
<div class="flex-grow-1 d-flex align-center justify-end">
<div style="color: red;">X</div>
</div>
</div>
<div *ngIf="capturedImage && capturedImageTitle" class="ion-item-container-no-border">
<!-- Captured -->
<div class="ion-item-container-no-border" *ngIf="capturedImage">
<ion-label class="attached-title">Fotografia Anexada</ion-label>
<ion-item lines="none" *ngIf="capturedImage">
<ion-item lines="none" >
<ion-thumbnail slot="start">
<ion-img [(ngModel)]="capturedImage" name="image" ngDefaultControl [src]="capturedImage"></ion-img>
</ion-thumbnail>
@@ -59,8 +45,23 @@
<ion-icon name="close"></ion-icon>
</button>
</ion-item>
</div>
<!-- current image -->
<div class="picture d-flex pb-5 hide-desktop" *ngIf="!( publication.FileBase64 == 'data:image/jpg;base64,null' || publication.FileBase64 == '' )" >
<div class="post-img">
<img src="{{publication.FileBase64}}" alt="image" >
</div>
<div class="d-flex flex-column pl-10">
<div class="picture-file-name">{{publication.OriginalFileName}}.{{publication.FileExtension}}</div>
<div class="size">75 Kb</div>
</div>
<div class="flex-grow-1 d-flex align-center justify-end">
<div style="color: red;">X</div>
</div>
</div>
<div class="ion-item-container-no-border hide-desktop">
<ion-label (click)="takePicture()">
@@ -42,7 +42,7 @@ export class NewPublicationPage implements OnInit {
guestPicture:any;
capturedImage:any = '';
capturedImageTitle:any;
capturedImageTitle:any = '';
photos: any[] = [];
constructor(
@@ -9,7 +9,6 @@ import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
import { PermissionService } from 'src/app/services/permission.service';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { PublicationFolderService } from 'src/app/store/publication-folder.service';
import { AskModalPage } from 'src/app/modals/ask-modal/ask-modal.page'
@Component({
selector: 'app-publication-detail-shared',
templateUrl: './publication-detail.page.html',
@@ -34,7 +33,6 @@ export class PublicationDetailPage implements OnInit {
public p:PermissionService,
private httpErrorHandle: HttpErrorHandle,
public publicationFolderService: PublicationFolderService,
public AskModalPage: AskModalPage
) {
/* this.folderId = this.navParams.get('folderIdId'); */