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

Improve pin logo

Browse Source
This commit is contained in:
Peter Maquiran
2021-11-15 15:29:43 +01:00
parent 0e1e1a4aae
commit 256dd97f1a
6 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/inactivity/inactivity.page.html
+3 -1
View File
@@ -7,7 +7,9 @@
<div class="div-top-header">
<div class="div-logo">
<img src='assets/images/logo-bg-removebg-preview.png' alt='logo'>
<img style="max-width: 90px;" *ngIf="ThemeService.currentTheme == 'default' " src='assets/images/logo-bg-removebg-preview.png' alt='logo'>
<img style="max-width: 80px;" *ngIf="ThemeService.currentTheme == 'gov' " src='assets/images/theme/gov/governoangola_A.png' alt='logo'>
<img style="max-width: 90px;" *ngIf="ThemeService.currentTheme == 'tribunal'" src='assets/images/theme/tribunal/tribunal-constitucional-logo-removebg-preview.png' alt='logo'>
</div>
</div>
src/app/pages/inactivity/inactivity.page.ts
+3 -2
View File
@@ -7,7 +7,7 @@ import { environment } from 'src/environments/environment';
import { AlertController } from '@ionic/angular';
import { NotificationsService } from 'src/app/services/notifications.service';
import { SessionStore } from 'src/app/store/session.service';
import { ThemeService } from 'src/app/services/theme.service';
@Component({
selector: 'app-inactivity',
@@ -29,7 +29,8 @@ export class InactivityPage implements OnInit {
private router: Router,
private authService: AuthService,
private toastService: ToastService,
public alertController: AlertController
public alertController: AlertController,
public ThemeService: ThemeService,
) {}
loop = false
src/app/pages/login/login.page.ts
+3 -2
View File
@@ -10,7 +10,7 @@ import { SessionStore } from 'src/app/store/session.service';
import { ClearStoreService } from 'src/app/services/clear-store.service';
import { ChangeProfileService } from 'src/app/services/change-profile.service';
import { ThemeService } from 'src/app/services/theme.service';
import { StorageService } from 'src/app/services/storage.service'
import { StorageService } from 'src/app/services/storage.service';
@Component({
selector: 'app-login',
@@ -39,7 +39,8 @@ export class LoginPage implements OnInit {
private clearStoreService: ClearStoreService,
private changeProfileService: ChangeProfileService,
public ThemeService: ThemeService,
private storageservice: StorageService
private storageservice: StorageService,
) {}
ngOnInit() {
src/app/services/agenda/list-box.service.ts
+12 -5
View File
@@ -94,12 +94,12 @@ export class ListBoxService {
if (diffDays >= 1) {
const StartEvent = this.transForm(event, {startMany: true,endMany: false, middle: false, profile})
if(this.push(event, selectedDate)) days[day].push(StartEvent)
if(this.push(event, selectedDate)) days[day].push(StartEvent)
let i = 1;
// create event between date
// create event between date
while (startDate.getFullYear() != endDate.getFullYear() ||
startDate.getMonth() != endDate.getMonth() ||
startDate.getDate() != endDate.getDate()) {
@@ -132,12 +132,15 @@ export class ListBoxService {
}
} else {
if(this.push(event, selectedDate)) days[day].push(event)
}
} else {
if(this.push(event, selectedDate)) days[day].push(event)
}
}
}
if(this.push(event, selectedDate)) days[day].push(event)
@@ -158,8 +161,12 @@ export class ListBoxService {
push(event: any, selectedDate: Date) {
console.log(new Date(event.start).getDate(), selectedDate.getDate(), new Date(event.start).getDate() >= selectedDate.getDate())
return new Date(event.start).getMonth() == selectedDate.getMonth() &&
new Date(event.start).getFullYear() == selectedDate.getFullYear()
new Date(event.start).getFullYear() == selectedDate.getFullYear() &&
new Date(event.start).getDate() >= selectedDate.getDate()
}
encapsulation(eventsList:EventListStore[], profile): CustomCalendarEvent[] {