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

git pull made

Browse Source
This commit is contained in:
Eudes Inácio
2021-12-08 19:48:33 +01:00
parent ed9fa5829f 50c976b8f6
commit f7add4dfa5
49 changed files with 501 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/edit-event/edit-event.page.scss
+3 -1
View File
@@ -169,7 +169,7 @@
.app-name{
background: #42b9f2;
background: var(--title-text-color);
border-radius: 18px;
text-align: center;
display: flex;
@@ -188,6 +188,7 @@
.close-button {
display: none;
height: 20px;
}
@@ -199,5 +200,6 @@
.close-button {
display: block !important;
height: 20px;
}
}
src/app/pages/agenda/new-event/new-event.page.scss
+2 -1
View File
@@ -180,7 +180,7 @@ ion-content{
.app-name{
background: #42b9f2;
background: var(--title-text-color);
border-radius: 18px;
text-align: center;
display: flex;
@@ -199,6 +199,7 @@ ion-content{
.close-button {
display: none;
height: 20px;
}
src/app/pages/chat/chat.page.ts
+4 -4
View File
@@ -158,14 +158,14 @@ export class ChatPage implements OnInit {
console.log(t);
this.setStatus('away');
if (this.dataService.get("newGroup")) {
/* if(this.dataService.get("newGroup")){
this.openNewGroupPage();
}
} */
this.router.events.forEach((event) => {
if (event instanceof NavigationStart && event.url.startsWith('/home/chat')) {
if (window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/chat')) {
alert('OIII')
//alert('OIII')
} else {
if (this.dataService.get("newGroup")) {
this.openNewGroupPage();
@@ -456,7 +456,7 @@ export class ChatPage implements OnInit {
updatedat: element._updatedAt
}
console.log('TRANSFORM ROOM LIST',roomList )
console.log('TRANSFORM ROOM LIST', roomList)
this.sqlservice.addChatListRoom(roomList);
});
}
src/app/pages/chat/group-messages/group-messages.module.ts
+2 -3
View File
@@ -19,15 +19,14 @@ import { AngularCropperjsModule } from 'angular-cropperjs';
@NgModule({
imports: [
CommonModule,
BrowserModule,
FormsModule,
FontAwesomeModule,
IonicModule,
GroupMessagesPageRoutingModule,
ChatPopoverPageModule,
BtnModalDismissPageModule,
ImageCropperModule,
AngularCropperjsModule
/* ImageCropperModule,
AngularCropperjsModule */
],
declarations: [GroupMessagesPage]
src/app/pages/chat/group-messages/group-messages.page.html
+3 -3
View File
@@ -53,7 +53,7 @@
<div (click)="handleClick()" class="messages overflow-y-auto" #scrollMe>
<div class="welcome-text">
<ion-label>Esta conversa passou a grupo</ion-label><br />
<ion-label>Esta conversa passou a grupo TIAGO</ion-label><br />
<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">
@@ -90,9 +90,9 @@
</div>
</div>
</div>
</div>
</div>
{{last ? scrollToBottom() : ''}}
</div>
src/app/pages/chat/messages/messages.page.html
+4 -2
View File
@@ -60,7 +60,9 @@
<ion-label>{{msg.msg}}</ion-label>
<div *ngIf="msg.attachments" class="message-attachments">
<div *ngFor="let file of msg.attachments let i = index">
<img *ngIf="file.image_url" src="{{file.image_url}}" alt="image" (click)="imageSize(file.image_url)">
<div (click)="openPreview(msg)">
<img *ngIf="file.image_url" src="{{file.image_url}}" alt="image">
</div>
<div>
<div>
<div class="file">
@@ -138,7 +140,7 @@
<button (click)="stopRecording()">Stop Recording</button> -->
<div class="container width-100 d-flex">
<div>
<button class="btn-no-color" (click)="openChatOptions()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="chat-icon-options" src="assets/images/icons-add.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="chat-icon-options" src="assets/images/theme/gov/icons-add.svg"></ion-icon>
src/app/pages/chat/messages/messages.page.ts
+10 -11
View File
@@ -26,6 +26,7 @@ import { Haptics, ImpactStyle } from '@capacitor/haptics';
import { PreviewCameraPage } from 'src/app/modals/preview-camera/preview-camera.page';
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';
const IMAGE_DIR = 'stored-images';
@@ -667,7 +668,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
});
}
sliderOpts = {
zoom: false,
slidesPerView: 1.5,
@@ -676,7 +677,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
};
zoomActive = false;
zoomScale = 1;
sliderZoomOpts = {
allowSlidePrev: false,
allowSlideNext: false,
@@ -684,27 +685,27 @@ sliderZoomOpts = {
maxRatio: 5
},
on: {
zoomChange: (scale, imageEl, slideEl) => {
zoomChange: (scale, imageEl, slideEl) => {
this.zoomActive = true;
this.zoomScale = scale/5;
this.changeDetectorRef.detectChanges();
this.changeDetectorRef.detectChanges();
}
}
}
async touchEnd(zoomslides: IonSlides, card) {
// Zoom back to normal
const slider = await zoomslides.getSwiper();
const zoom = slider.zoom;
zoom.out();
// Card back to normal
card.el.style['z-index'] = 9;
this.zoomActive = false;
this.changeDetectorRef.detectChanges();
}
touchStart(card) {
// Make card appear above backdrop
card.el.style['z-index'] = 11;
@@ -713,15 +714,13 @@ touchStart(card) {
async openPreview(msg) {
const modal = await this.modalController.create({
component: PreviewCameraPage,
component: ViewMediaPage,
cssClass: 'modal modal-desktop',
componentProps: {
image: msg.attachments[0].image_url,
username: msg.u.name,
_updatedAt: msg._updatedAt,
}
});
modal.present();
}
src/app/pages/events/edit-event/edit-event.page.scss
+1 -1
View File
@@ -105,7 +105,7 @@
.attach-title-item{
width: 100%;
font-size: 15px;
color:#0d89d1;
color:var(--title-text-color);
}
/* SPAN */
.span-left{
src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.scss
+9 -7
View File
@@ -144,7 +144,7 @@ ion-menu{
.app-name{
background: #42b9f2;
background: var(--title-text-color);
border-radius: 18px;
text-align: center;
display: flex;
@@ -163,18 +163,20 @@ ion-menu{
.close-button {
display: none;
height: 20px;
}
.list:hover {
.app-name {
display: none;
}
.app-name {
display: none;
}
.close-button {
display: block !important;
}
.close-button {
display: block !important;
height: 20px;
}
}
.attach-title-item{
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss
+2 -1
View File
@@ -174,7 +174,7 @@
.app-name{
background: #42b9f2;
background: var(--title-text-color);
border-radius: 18px;
text-align: center;
display: flex;
@@ -193,6 +193,7 @@
.close-button {
display: none;
height: 20px;
}
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss
+3 -2
View File
@@ -154,7 +154,7 @@ font-size: 13px;
.app-name{
background: #42b9f2;
background: var(--title-text-color);
border-radius: 18px;
text-align: center;
display: flex;
@@ -173,6 +173,7 @@ font-size: 13px;
.close-button {
display: none;
height: 20px;
}
@@ -189,7 +190,7 @@ font-size: 13px;
.app-name{
background: #42b9f2;
background: var(--title-text-color);
border-radius: 18px;
text-align: center;
display: flex;
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+1 -1
View File
@@ -118,7 +118,7 @@
<button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
<button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
<button (click)="openNewGroupPage()" class="btn-cancel" shape="round" >Iniciar Conversa</button>
<button (click)="openNewGroupPage(task)" class="btn-cancel" shape="round" >Iniciar Conversa</button>
<div hidden class="solid"></div>
<button hidden class="btn-cancel" shape="round" >Delegar</button>
</div> -->
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+3 -2
View File
@@ -642,8 +642,8 @@ export class ExpedienteDetailPage implements OnInit {
}
else {
this.dataService.set("newGroup", true);
/* this.closeAllDesktopComponents();
this.showNewGroup=true; */
this.dataService.set("task", this.task);
this.dataService.set("newGroupName", this.task.Folio);
}
}
@@ -653,6 +653,7 @@ export class ExpedienteDetailPage implements OnInit {
cssClass: 'modal modal-desktop',
componentProps: {
name: this.task.Folio,
task: this.task
},
});
await modal.present();
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
+4 -1
View File
@@ -63,7 +63,7 @@
<div class="bottom-content width-100">
<ion-list>
<h5>Documentos Anexados</h5>
<ion-item *ngFor="let attachment of attachments"
<ion-item *ngFor="let attachment of attachments"
class="ion-no-margin ion-no-padding cursor-pointer"
>
<ion-label
@@ -130,6 +130,9 @@
<button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
</div>
<div class="buttons">
<button (click)="openNewGroupPage(task)" class="btn-cancel" shape="round" >Iniciar Conversa</button>
</div>
</div>
</div>
</div>
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+31 -1
View File
@@ -26,6 +26,8 @@ import { BackgroundService } from 'src/app/services/background.service';
import { PermissionService } from 'src/app/services/worker/permission.service';
import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
import { ThemeService } from 'src/app/services/theme.service'
import { DataService } from 'src/app/services/data.service';
import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page';
@Component({
@@ -66,7 +68,8 @@ export class PedidoPage implements OnInit {
private sqliteservice: SqliteService,
private backgroundservices: BackgroundService,
private platform: Platform,
public ThemeService: ThemeService
public ThemeService: ThemeService,
private dataService: DataService,
) {
this.loggeduser = authService.ValidatedUser;
@@ -477,6 +480,33 @@ export class PedidoPage implements OnInit {
modal.onDidDismiss();
}
openNewGroupPage(task?:any){
this.router.navigate(['/home/chat']);
this.dataService.set("newGroup", true);
if( window.innerWidth < 801){
this.newGroup();
}
else{
this.dataService.set("newGroup", true);
this.dataService.set("task", this.task);
this.dataService.set("newGroupName", this.task.Folio);
}
}
async newGroup(){
const modal = await this.modalController.create({
component: NewGroupPage,
cssClass: 'modal modal-desktop',
componentProps: {
name: this.task.Folio,
task: this.task
},
});
await modal.present();
modal.onDidDismiss();
}
// async viewEventDetail(eventId: any) {
// const modal = await this.modalController.create({
src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html
+1 -1
View File
@@ -23,7 +23,7 @@
</div>
<div class="post-item overflow-y-auto">
<div *ngIf="publication.FileBase64.length > 30" class="post-img">
<div (click)="openPreview(publication)" *ngIf="publication.FileBase64.length > 30" class="post-img">
<img src="{{publication.FileBase64}}" alt="image" >
</div>
<div *ngIf="publication.FileBase64.length < 30" class="post-img">
src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
+11 -6
View File
@@ -8,6 +8,7 @@ import { ImageModalPage } from '../../gallery/image-modal/image-modal.page';
import { NewPublicationPage } from '../../new-publication/new-publication.page';
import { Location } from '@angular/common';
import { ThemeService } from 'src/app/services/theme.service'
import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
@Component({
@@ -122,7 +123,7 @@ export class PublicationDetailPage implements OnInit {
} finally {
loader.remove()
}
}
@@ -146,13 +147,17 @@ export class PublicationDetailPage implements OnInit {
});
}
openPreview(imageUrl:string){
this.modalController.create({
component: ImageModalPage,
async openPreview(item) {
const modal = await this.modalController.create({
component: ViewMediaPage,
cssClass: 'modal modal-desktop',
componentProps: {
imageUrl:imageUrl,
image: item.FileBase64,
username: item.Title,
_updatedAt: item.DatePublication
}
}).then(modal => modal.present());
});
modal.present();
}
src/app/pages/publications/view-publications/view-publications.page.scss
+3 -3
View File
@@ -45,8 +45,6 @@
width: 100%; /* 400px */
height: 100%;
font-family: Roboto;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
background-color: #fff;
overflow:hidden;
padding: 25px 20px 0px 20px;
@@ -96,9 +94,11 @@
/* padding: 0!important; */
float: left;
margin: 2.5px 0 0 5px;
color: #000 !important;
}
.title{
font-size: 25px;
color: #000 !important;
}
.actions-icon{
@@ -126,7 +126,7 @@
}
.post-img{
width: 100%;
height: 400px;
//height: 400px;
margin: 0 auto;
border-radius: 0px!important;
overflow: hidden;
src/app/pages/publications/view-publications/view-publications.page.ts
+9 -15
View File
@@ -116,18 +116,12 @@ export class ViewPublicationsPage implements OnInit {
}
getPublicationDetail() {
setTimeout(() => {
let allActions = this.publicationEventFolderStorage.list.concat(this.publicationTravelFolderService.list)
console.log('ACTION ACTION', this.publicationList)
this.item = allActions.find((e) => e.ProcessId == this.folderId);
this.publicationDitails = this.item
console.log('item', this.item)
}, 100);
this.publications.GetPresidentialAction(this.folderId).subscribe(res=>{
console.log(res);
this.item = res;
});
}
// goes to fork
// getPublicationsIds() {
@@ -178,14 +172,14 @@ export class ViewPublicationsPage implements OnInit {
this.showLoader = false;
/* this.publicationList = new Array();
res.forEach(element => {
console.log('getPublications', element)
let item: Publication = this.publicationPipe.itemList(element)
this.publicationList.push(item);
});
this.sqliteservice.updateactions(this.folderId, JSON.stringify(this.publicationList));
this.publicationListStorage.add(folderId, this.publicationList)
this.getpublication = this.publicationList; */
});
@@ -233,8 +227,8 @@ export class ViewPublicationsPage implements OnInit {
forkJoin([
this.getPublicationsIds(),
this.getPublications(),
]).subscribe(allResults =>{
this.publicationList = allResults[2]
})