diff --git a/Mohem/src/app/eit/add-eit/add-eit.component.ts b/Mohem/src/app/eit/add-eit/add-eit.component.ts
index cf7adcab..81cc100e 100644
--- a/Mohem/src/app/eit/add-eit/add-eit.component.ts
+++ b/Mohem/src/app/eit/add-eit/add-eit.component.ts
@@ -661,7 +661,7 @@ export class AddEitComponent implements OnInit {
this.eitService.getDefaultValue(body).subscribe((result: any) => {
let elem = this.getElementByName(segmentName);
- console.log(elem);
+ // console.log(elem);
// if(elem.dataset.hiddenval){
// elem.dataset.hiddenval="";
// return false;
@@ -694,7 +694,7 @@ export class AddEitComponent implements OnInit {
if (isSelectElement) {
let elem = this.getSelectElementByName(segmentName);
elem = document.getElementById(elem),
- alert(elem.length);
+ //alert(elem.length);
// var firstoption = document.createElement("option");
// firstoption.text = text;
// firstoption.value = val;
@@ -703,11 +703,11 @@ export class AddEitComponent implements OnInit {
//elem.text=text;
}else{
- console.log("else - " + elem.value);
+ // console.log("else - " + elem.value);
elem.value = val;
elem.innerText = text;
elem.setAttribute("value", val);
- console.log("else - " + elem.value);
+ // console.log("else - " + elem.value);
}
}
if (isHidden || isReadOnlyList) {
diff --git a/Mohem/src/app/hmg-common/services/connector/connector.service.ts b/Mohem/src/app/hmg-common/services/connector/connector.service.ts
index 1cecff37..adb01bad 100644
--- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts
+++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts
@@ -24,8 +24,8 @@ export class ConnectorService {
public static timeOut = 30 * 1000;
// public static host = 'http://10.50.100.113:6060/'; // development service
- public static host = "https://uat.hmgwebservices.com/";
- // public static host = 'https://hmgwebservices.com/';
+public static host = "https://uat.hmgwebservices.com/";
+ //public static host = 'https://hmgwebservices.com/';
// public static host = 'http://10.50.100.198:6060/';
// public static host = 'http://10.50.100.113:6060/'; // development service
/* public static host = 'http://10.50.100.198:6060/';
diff --git a/Mohem/src/app/payslip/home/home.component.ts b/Mohem/src/app/payslip/home/home.component.ts
index 769e7f6c..4ab1ab45 100644
--- a/Mohem/src/app/payslip/home/home.component.ts
+++ b/Mohem/src/app/payslip/home/home.component.ts
@@ -25,8 +25,7 @@ export class HomeComponent implements OnInit {
public payslipService:PayslipService,
public ts: TranslatorService,
public common: CommonService,
- public sharedData: SharedDataService,
- public authService: AuthenticationService
+ public sharedData: SharedDataService
) {}
ngOnInit() {
diff --git a/Mohem/src/app/time-card/home/home.component.html b/Mohem/src/app/time-card/home/home.component.html
new file mode 100644
index 00000000..afc16a36
--- /dev/null
+++ b/Mohem/src/app/time-card/home/home.component.html
@@ -0,0 +1,3 @@
+
+ home works!
+
diff --git a/Mohem/src/app/time-card/home/home.component.scss b/Mohem/src/app/time-card/home/home.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/Mohem/src/app/time-card/home/home.component.spec.ts b/Mohem/src/app/time-card/home/home.component.spec.ts
new file mode 100644
index 00000000..5ec1377b
--- /dev/null
+++ b/Mohem/src/app/time-card/home/home.component.spec.ts
@@ -0,0 +1,27 @@
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { HomeComponent } from './home.component';
+
+describe('HomeComponent', () => {
+ let component: HomeComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ HomeComponent ],
+ schemas: [CUSTOM_ELEMENTS_SCHEMA],
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(HomeComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/Mohem/src/app/time-card/home/home.component.ts b/Mohem/src/app/time-card/home/home.component.ts
new file mode 100644
index 00000000..a7aad8ad
--- /dev/null
+++ b/Mohem/src/app/time-card/home/home.component.ts
@@ -0,0 +1,14 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-home',
+ templateUrl: './home.component.html',
+ styleUrls: ['./home.component.scss'],
+})
+export class HomeComponent implements OnInit {
+
+ constructor() { }
+
+ ngOnInit() {}
+
+}
diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.html b/Mohem/src/app/time-card/time-card-details/time-card-details.component.html
new file mode 100644
index 00000000..633c94d1
--- /dev/null
+++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.html
@@ -0,0 +1,3 @@
+
+ time-card-details works!
+
diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss b/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.spec.ts b/Mohem/src/app/time-card/time-card-details/time-card-details.component.spec.ts
new file mode 100644
index 00000000..976086ff
--- /dev/null
+++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.spec.ts
@@ -0,0 +1,27 @@
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TimeCardDetailsComponent } from './time-card-details.component';
+
+describe('TimeCardDetailsComponent', () => {
+ let component: TimeCardDetailsComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ TimeCardDetailsComponent ],
+ schemas: [CUSTOM_ELEMENTS_SCHEMA],
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(TimeCardDetailsComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts b/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts
new file mode 100644
index 00000000..8fa456db
--- /dev/null
+++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts
@@ -0,0 +1,14 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-time-card-details',
+ templateUrl: './time-card-details.component.html',
+ styleUrls: ['./time-card-details.component.scss'],
+})
+export class TimeCardDetailsComponent implements OnInit {
+
+ constructor() { }
+
+ ngOnInit() {}
+
+}
diff --git a/Mohem/src/app/time-card/time-card.module.ts b/Mohem/src/app/time-card/time-card.module.ts
index 4e1ae971..e79e452f 100644
--- a/Mohem/src/app/time-card/time-card.module.ts
+++ b/Mohem/src/app/time-card/time-card.module.ts
@@ -6,11 +6,23 @@ import { Routes, RouterModule } from '@angular/router';
import { IonicModule } from '@ionic/angular';
import { TimeCardPage } from './time-card.page';
+import { TimeCardDetailsComponent } from './time-card-details/time-card-details.component';
+import { HomeComponent } from './home/home.component';
const routes: Routes = [
{
path: '',
- component: TimeCardPage
+ component: TimeCardPage,
+ children: [
+ {
+ path: 'home',
+ component: HomeComponent
+ },
+ {
+ path: 'time-card-details',
+ component: TimeCardDetailsComponent
+ }
+ ]
}
];
@@ -21,6 +33,10 @@ const routes: Routes = [
IonicModule,
RouterModule.forChild(routes)
],
- declarations: [TimeCardPage]
+ declarations: [
+ TimeCardPage,
+ HomeComponent,
+ TimeCardDetailsComponent
+ ]
})
export class TimeCardPageModule {}
diff --git a/Mohem/src/app/time-card/time-card.page.html b/Mohem/src/app/time-card/time-card.page.html
index 5a318c63..67cbe279 100644
--- a/Mohem/src/app/time-card/time-card.page.html
+++ b/Mohem/src/app/time-card/time-card.page.html
@@ -1,9 +1,3 @@
-
-
- time-card
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/Mohem/src/app/uI-elements/date-time.input.ts b/Mohem/src/app/uI-elements/date-time.input.ts
index 4b623765..aa5c15d8 100644
--- a/Mohem/src/app/uI-elements/date-time.input.ts
+++ b/Mohem/src/app/uI-elements/date-time.input.ts
@@ -45,7 +45,7 @@ export class DateTimeInput extends UiElement {
"" +
" " + this.label + "" +
// " " + this.value + "
" +
- "" +
+ "" +
// " "+
// " "+
// " "+
diff --git a/Mohem/src/app/uI-elements/date.input.ts b/Mohem/src/app/uI-elements/date.input.ts
index 630fa6ac..9e486e9e 100644
--- a/Mohem/src/app/uI-elements/date.input.ts
+++ b/Mohem/src/app/uI-elements/date.input.ts
@@ -44,7 +44,7 @@ export class DateInput extends UiElement {
"" +
" " + this.label + "" +
// " " + this.value + "
" +
- "" +
+ "" +
// " "+
// " "+
// " "+
diff --git a/Mohem/src/imgs/MissingSwipe.png b/Mohem/src/imgs/MissingSwipe.png
new file mode 100644
index 00000000..ec7ffcf5
Binary files /dev/null and b/Mohem/src/imgs/MissingSwipe.png differ
diff --git a/Mohem/src/imgs/MyTimeCard.png b/Mohem/src/imgs/MyTimeCard.png
new file mode 100644
index 00000000..9ff482cc
Binary files /dev/null and b/Mohem/src/imgs/MyTimeCard.png differ
diff --git a/Mohem/src/imgs/Timeback.png b/Mohem/src/imgs/Timeback.png
new file mode 100644
index 00000000..287f57ab
Binary files /dev/null and b/Mohem/src/imgs/Timeback.png differ
diff --git a/Mohem/src/imgs/WorkOnBreak.png b/Mohem/src/imgs/WorkOnBreak.png
new file mode 100644
index 00000000..f1f1faa2
Binary files /dev/null and b/Mohem/src/imgs/WorkOnBreak.png differ