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

remove un used import

Browse Source
This commit is contained in:
Peter Maquiran
2023-06-22 12:53:35 +01:00
parent f849610b8c
commit 6ea40ab55f
37 changed files with 289 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/agenda/view-event/view-event.page.html
+14 -2
View File
@@ -14,14 +14,26 @@
</div>
<div class="div-icon d-flex align-base">
<button class="btn-no-color" (click)="editEvent()">
<!-- <button class="btn-no-color" (click)="editEvent()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="edit" slot="end" src="assets/images/icons-edit.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="edit" slot="end" src="assets/images/theme/gov/icons-edit.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="edit" slot="end" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-edit.svg" ></ion-icon>
</button>
<button class="btn-no-color" (click)="deleteYesOrNo()">
<ion-icon class="delete" name="trash-sharp"></ion-icon>
</button>
</button> -->
<div class="div-icon" (click)="openOptions()">
<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>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-menu.svg"></ion-icon>
</div>
<div *ngIf="loadedEvent.Subject">
<div (click)="editEvent()">Editar</div>
<div (click)="deleteYesOrNo()">Apagar</div>
<div id="desktop-create-chat-from-event" (click)="openNewGroupPage()">Criar Conversa</div>
</div>
</div>
</div>
src/app/shared/agenda/view-event/view-event.page.ts
+15 -3
View File
@@ -15,8 +15,8 @@ import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.pag
import { ThemeService } from 'src/app/services/theme.service';
import { SessionStore } from 'src/app/store/session.service';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'
import { NavigationExtras, Router } from '@angular/router';
import { EventController } from 'src/app/controller/event'
@Component({
selector: 'app-view-event',
templateUrl: './view-event.page.html',
@@ -59,7 +59,8 @@ export class ViewEventPage implements OnInit {
public popoverController: PopoverController,
private toastService: ToastService,
public ThemeService: ThemeService,
private httpErrorHandle: HttpErrorHandle
private httpErrorHandle: HttpErrorHandle,
private router: Router,
) {
this.isEventEdited = false;
this.loadedEvent = new Event();
@@ -95,6 +96,17 @@ export class ViewEventPage implements OnInit {
this.dicIndex = index;
}
async openNewGroupPage() {
let roomName = this.loadedEvent.Subject
let attendees = this.loadedEvent.Attendees
const room = await EventController.createOrFindGroupFromEvent(roomName, attendees)
let navigationExtras: NavigationExtras = { queryParams: { "roomId": room.id } };
this.router.navigate(['/home/chat'], navigationExtras);
}
close() {
this.viewEventDetailDismiss.emit({
src/app/shared/chat/new-group/group-chat/group-chat-routing.module.ts
-17
View File
@@ -1,17 +0,0 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { GroupChatPage } from './group-chat.page';
const routes: Routes = [
{
path: '',
component: GroupChatPage
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class GroupChatPageRoutingModule {}
src/app/shared/chat/new-group/group-chat/group-chat.module.ts
-25
View File
@@ -1,25 +0,0 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular';
import { GroupChatPageRoutingModule } from './group-chat-routing.module';
import { GroupChatPage } from './group-chat.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module';
import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
GroupChatPageRoutingModule,
BtnSeguintePageModule,
BtnModalDismissPageModule,
],
declarations: [GroupChatPage]
})
export class GroupChatPageModule {}
src/app/shared/chat/new-group/group-chat/group-chat.page.html
-17
View File
@@ -1,17 +0,0 @@
<ion-header class="ion-no-border">
<ion-toolbar class="header-toolbar">
<div class="main-header">
<div class="title-content">
<app-btn-modal-dismiss></app-btn-modal-dismiss>
<div class="middle">
<ion-label class="title">Novo Grupo</ion-label>
</div>
<app-btn-seguinte></app-btn-seguinte>
</div>
</div>
</ion-toolbar>
</ion-header>
<ion-content>
</ion-content>
src/app/shared/chat/new-group/group-chat/group-chat.page.scss
View File
src/app/shared/chat/new-group/group-chat/group-chat.page.spec.ts
-24
View File
@@ -1,24 +0,0 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { GroupChatPage } from './group-chat.page';
describe('GroupChatPage', () => {
let component: GroupChatPage;
let fixture: ComponentFixture<GroupChatPage>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ GroupChatPage ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(GroupChatPage);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/shared/chat/new-group/group-chat/group-chat.page.ts
-15
View File
@@ -1,15 +0,0 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-group-chat',
templateUrl: './group-chat.page.html',
styleUrls: ['./group-chat.page.scss'],
})
export class GroupChatPage implements OnInit {
constructor() { }
ngOnInit() {
}
}
src/app/shared/chat/new-group/new-group-routing.module.ts
+22 -25
View File
@@ -1,29 +1,26 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { NewGroupPage } from './new-group.page';
const routes: Routes = [
{
path: '',
component: NewGroupPage
},
{
path: 'contacts',
loadChildren: () => import('./contacts/contacts.module').then( m => m.ContactsPageModule)
},
{
path: 'group-chat',
loadChildren: () => import('./group-chat/group-chat.module').then( m => m.GroupChatPageModule)
},
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { NewGroupPage } from './new-group.page';
const routes: Routes = [
{
path: '',
component: NewGroupPage
},
{
path: 'contacts',
loadChildren: () => import('./contacts/contacts.module').then( m => m.ContactsPageModule)
},
{
path: 'group-contacts',
loadChildren: () => import('./group-contacts/group-contacts.module').then( m => m.GroupContactsPageModule)
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class NewGroupPageRoutingModule {}
src/app/shared/chat/new-group/new-group.page.ts
+21 -7
View File
@@ -1,6 +1,5 @@
import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { ModalController, PickerController, PopoverController } from '@ionic/angular';
import { AuthService } from 'src/app/services/auth.service';
import { ChatSystemService } from 'src/app/services/chat/chat-system.service';
import { DataService } from 'src/app/services/data.service';
import { GroupDurationPage } from 'src/app/shared/popover/group-duration/group-duration.page';
@@ -9,7 +8,6 @@ import { GroupContactsPage } from '../group-messages/group-contacts/group-contac
import { ToastService } from 'src/app/services/toast.service';
import { ThemeService } from 'src/app/services/theme.service';
import { RouteService } from 'src/app/services/route.service';
import { Router } from '@angular/router';
@Component({
selector: 'app-new-group',
templateUrl: './new-group.page.html',
@@ -25,9 +23,15 @@ export class NewGroupPage implements OnInit{
selectedDuration = ['','',''];
countDownTime:any;
task:any;
event: any
link = ''
documents: any;
loggedUserChat: any;
contact: {
Email: string
DisplayName: string
}[]
@Input() roomId: string;
@Input() groupName:string;
@@ -41,9 +45,7 @@ export class NewGroupPage implements OnInit{
private popoverController: PopoverController,
private modalController: ModalController,
private dataService:DataService,
private router: Router,
public ChatSystemService: ChatSystemService,
private authService: AuthService,
private toastService: ToastService,
public ThemeService: ThemeService,
private RouteService: RouteService,
@@ -55,12 +57,24 @@ export class NewGroupPage implements OnInit{
ngOnInit() {
this.task = this.dataService.get("task");
this.event = this.dataService.get("event");
if(this.task) {
this.link = this.dataService.get("link");
this.groupName = this.task.Folio;
this.documents = this.dataService.get("documents");
this.dataService.set("newGroup", false);
this.dataService.set("link", false);
} else if (this.event) {
//
this.link = this.dataService.get("link");
this.groupName = this.event.Subject;
this.documents = this.dataService.get("documents");
this.contact = this.dataService.get("contacts");
//
this.dataService.set("newGroup", false);
this.dataService.set("link", false);
}
}
@@ -194,7 +208,7 @@ export class NewGroupPage implements OnInit{
}, 150);
}
async addContacts(){
async addContacts() {
this.close();
let name = this.groupName.split(' ').join('-');
@@ -225,7 +239,7 @@ export class NewGroupPage implements OnInit{
return await popover.present();
}
async showPicker(){
async showPicker() {
const picker = await this.pickerController.create({
cssClass: '',
buttons: [