Solve master changes

Author: sbateca

README.md

@@ -30,14 +30,14 @@ Run `npm install -g @angular/cli` to install Angular CLI
 
 You can download it from here: https://www.docker.com/get-started/ you will find the perfect Docker version for you.
 
-### Chocolatey
+### Chocolatey (Only Windows)
 
 By installing this, you'll be able to use the commands to run your proyect.
 You can do it by following the steps here https://chocolatey.org/install. Although the page tells you to use Powershell, you should be able to use any command line with admin permissions. Don't forget to select the "Individual button" before following the installation steps.
 
 ![image](https://user-images.githubusercontent.com/42116904/166069074-f76d9bd3-01b9-4c50-92e7-c7558d026783.png)
 
-### Make
+### Make (Only Windows)
 
 You will need to install Make for you to be easier setting your environment. 
 In your command line with admin permissions run `choco install make`
@@ -46,18 +46,6 @@ In your command line with admin permissions run `choco install make`
 
 In project path, open your favourite command line and run `npm install` in order to be able to run the project locally.
 
-## Development server
-
-Yo have 2 ways to run this project in dev mode:
-
-**First**:
-- In your project path, open your favourite command line and run the follwing commands: `make build` then `make run` and finally `make log`. When the project is successfully compiled you can go to `http://localhost:4200/` in your browser. Remember you must have your Docker running.
-
-**Second**:
-- Run `ng serve` to run the app in dev mode. After executing this command, you can navigate to `http://localhost:4200/` to see the app working. This method is usefull when you want to run a specific branch using less time but not recommended when doing QA.
-
-In any case, the app will automatically reload if you change anything in the source files.
-
 # Prepare your environment
 
 ### Set environment variables
@@ -87,6 +75,18 @@ Install the following extensions:
 - `Prettier - Code formatter`.
 - Go to user settings (`settings.json`) and enable formatting on save: `"editor.formatOnSave": true`.
 
+## Development server
+
+Yo have 2 ways to run this project in dev mode:
+
+**First**:
+- In your project path, open your favourite command line and run the follwing commands: `make build` then `make run` and finally `make logs`. When the project is successfully compiled you can go to `http://localhost:4200/` in your browser. Remember you must have your Docker running.
+
+**Second**:
+- Run `ng serve` to run the app in dev mode. After executing this command, you can navigate to `http://localhost:4200/` to see the app working. This method is usefull when you want to run a specific branch using less time but not recommended when doing QA.
+
+In any case, the app will automatically reload if you change anything in the source files.
+
 ### Commit messages format
   Commit messages' format follows the [Conventional Commits guidelines](https://www.conventionalcommits.org/en/v1.0.0/#summary) specification,
   and specifically we are relying on the [Angular commit specifications](https://github.com/angular/angular/blob/22b96b9/CONTRIBUTING.md#-commit-message-guidelines) to bump the [semantic version](https://semver.org/) and generate app change log.

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-lock.json

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

package.json

@@ -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/reports/components/time-entries-table/time-entries-table.component.spec.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');

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

@@ -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')