[Bad UX] Reports layout TT-664

infrastructure/main.tf

@@ -42,7 +42,8 @@ locals {
 }
 
 module "ui" {
-  source                   = "[email protected]:ioet/infra-terraform-modules.git//azure-app-service?ref=tags/v0.0.5"
+  #source = "../../infra-terraform-modules/azure-app-service"
+  source                   = "[email protected]:ioet/infra-terraform-modules.git//azure-app-service?ref=tags/v0.0.13"
   app_service_name         = local.service_name
   create_app_service_plan  = local.create_app_service_plan
   docker_image_name        = "${local.image_name}:${var.image_tag}"
@@ -52,8 +53,9 @@ module "ui" {
   docker_registry_username = data.terraform_remote_state.service.outputs.container_registry_admin_username
   location                 = data.terraform_remote_state.service.outputs.container_registry_location
   resource_group_name      = data.terraform_remote_state.service.outputs.resource_group_name
-  service_plan_kind        = local.service_plan_kind
   service_plan_name        = local.service_name
   service_plan_size        = var.service_plan_size
   service_plan_tier        = var.service_plan_tier
+  hostname                 = "ui"
+  dns_zone_name            = data.terraform_remote_state.service.outputs.subdomain
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "time-tracker",
-  "version": "1.72.5",
+  "version": "1.72.9",
   "scripts": {
     "config": "ts-node ./scripts/setenv.ts",
     "preinstall": "npx npm-force-resolutions",

src/app/modules/reports/components/time-entries-table/time-entries-table.component.spec.ts

@@ -190,7 +190,7 @@ describe('Reports Page', () => {
 
     it('Should populate the users with the payload from the action executed', () => {
       const actionSubject = TestBed.inject(ActionsSubject) as ActionsSubject;
-      const usersArray = []
+      const usersArray = [];
       const action = {
         type: UserActionTypes.LOAD_USERS_SUCCESS,
         payload: usersArray
@@ -201,7 +201,7 @@ describe('Reports Page', () => {
 
       expect(component.users).toEqual(usersArray);
     });
-    
+
     it('The sum of the data dates is equal to {"hours": 3, "minutes":20,"seconds":0}', () => {
       let {hours,minutes,seconds}: TotalHours = component.sumDates(timeEntryList);
       expect({hours, minutes, seconds}).toEqual({hours:3,minutes:20,seconds:0});

src/app/modules/shared/components/details-fields/details-fields.component.ts

@@ -361,7 +361,7 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
 
     const isStartDateInTheFuture = moment(startDateToSubmit).isAfter(moment());
     const isEndDateInTheFuture = moment(endDateToSubmit).isAfter(moment());
-    const timeEntryIsInTheFuture = isStartDateInTheFuture || isEndDateInTheFuture;
+    const timeEntryIsInTheFuture = isStartDateInTheFuture || (isEndDateInTheFuture && !this.goingToWorkOnThis);
 
     if (timeEntryIsInTheFuture) {
       this.toastrService.error('You cannot start a time-entry in the future');

tasks.py

@@ -0,0 +1,11 @@
+from invoke import task
+
+@task
+def set_environment(c, command):
+    try:
+        c.run('npm install')
+        c.run('make build')
+        c.run('make run')
+        c.run('make logs')
+    except:
+        print('\n Something went wrong')