mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
Merge branch 'feature/digital-workspace-1' of bitbucket.org:equilibriumito/gabinete-digital-fo into feature/digital-workspace-1
This commit is contained in:
@@ -144,8 +144,16 @@ export class ChatPage implements OnInit {
|
||||
|
||||
let t = this.showDateDuration(new Date());
|
||||
|
||||
this.router.events.forEach((event) => {
|
||||
if (event instanceof NavigationStart && event.url.startsWith('/home/chat')) {
|
||||
if (this.dataService.get("newGroup")) {
|
||||
this.openNewGroupPage();
|
||||
}
|
||||
else{
|
||||
this.closeAllDesktopComponents();
|
||||
this.showEmptyComponent = true;
|
||||
}
|
||||
|
||||
/* this.router.events.forEach((event) => {
|
||||
if (event instanceof NavigationStart || event.url.endsWith('/home/chat')) {
|
||||
if (this.dataService.get("newGroup")) {
|
||||
this.openNewGroupPage();
|
||||
}
|
||||
@@ -157,7 +165,7 @@ export class ChatPage implements OnInit {
|
||||
else{
|
||||
this.dataService.set("newGroup", false);
|
||||
}
|
||||
});
|
||||
}); */
|
||||
}
|
||||
|
||||
numSequence(n: number): Array<number> {
|
||||
|
||||
@@ -37,7 +37,8 @@
|
||||
</div>
|
||||
</form>
|
||||
<div class="msg-bottom d-flex">
|
||||
<p class="msg-bottom-p">Uma iniciativa do Gabinete do Calendário Partilhado</p>
|
||||
<!-- <p class="msg-bottom-p">Uma iniciativa do Gabinete do Calendário Partilhado</p> -->
|
||||
<p class="msg-bottom-p"> </p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -58,11 +58,10 @@
|
||||
<div class="logo-description-content">
|
||||
<!-- <p class="logo-description-text">Calendário Partilhado</p> -->
|
||||
|
||||
<!-- <div *ngIf="ThemeService.currentTheme == 'default' " class="logo-description-content">
|
||||
<p class="logo-description-text color-white">Calendário Partilhado</p>
|
||||
<div class="add-line color-white" style="border-bottom-color: white;"></div>
|
||||
<div *ngIf="ThemeService.currentTheme == 'default' " class="logo-description-content">
|
||||
<p class="logo-description-text color-white">GABINETE DIGITAL</p>
|
||||
</div> -->
|
||||
<div class="add-line-white"></div>
|
||||
</div>
|
||||
|
||||
<div *ngIf="ThemeService.currentTheme == 'gov' " class="logo-description-content">
|
||||
<p *ngIf="environment.presidencia" class="logo-description-text">Calendário Partilhado</p>
|
||||
|
||||
Reference in New Issue
Block a user