Worker app by Azety · Pull Request #93 · tm-pe2/ad-website

Azety · 2022-05-17T09:06:49Z

still few fixes to do

DrunkenToast

Focus on getting API communication working but made some comments none-the-less.

DrunkenToast · 2022-05-18T12:51:49Z

@@ -0,0 +1,55 @@
+export class Cust {


Use interfaces instead of classes

DrunkenToast · 2022-05-18T12:52:31Z

  {path: 'ticketing/:userType', component: TicketingComponent},
  {path: 'graphs', component: GraphsComponent},
  {path: 'statuscode/:statusCode', component: StatuscodepageComponent},
+  {path: 'workerapp', component: WorkerappComponent},


It's not really an app. It's just a site.
Cant you name this to something like manage-meters or similar?

DrunkenToast · 2022-05-18T12:54:01Z

@@ -0,0 +1,3 @@
+<div class="bg-slate-300 m-3 drop-shadow-md h-fit rounded-lg p-3" id="list">
+    <app-list-element [parent]="this"></app-list-element>


hmm? Use ngFor for list items. Passing a parent like this is strange.

DrunkenToast · 2022-05-18T12:54:30Z

+/*
+    // Get planning
+    this.service.getPlanning()
+    .subscribe(plannings => 
+      { this.planningList = plannings as Planning[]; })
+
+    // Add each customer to the list
+    this.planningList.forEach(planning => 
+      {
+        if (planning.Date == this.today)
+        this.service.getCustomer(planning.CustomerID).subscribe(customer => 
+          { this.tempCustomer = customer as Customer; })
+
+        this.service.getAddress(this.tempCustomer.AdressID).subscribe(address =>
+          { this.tempAddress = address as Address; })
+
+        this.service.getInvoices().subscribe(invoices =>
+          { this.invoicesList = invoices as Invoice[]; })
+
+        this.invoicesList.reverse();
+
+        // Add all necesary data to a temporary cust variable
+        tempCust: new Cust(this.employeeID);
+
+        this.name = this.tempCustomer.LastName + ', ' + this.tempCustomer.FirstName;
+        this.address = this.tempAddress.Street + ' ' + this.tempAddress.HouseNumber + ', ' + this.tempAddress.City + ' ' + this.tempAddress.PostalCode + ', ' + this.tempAddress.Country; 
+
+        // Assign other variables to tempCust
+        this.tempCust.setCid(planning.CustomerID);
+        this.tempCust.setName(this.name);
+        this.tempCust.setAddress(this.address);
+        this.tempCust.setCurrentDate(planning.Date);
+
+        // Status
+        if (planning.Status == 0) { this.tempCust.setStatus('Not completed'); }
+        else { this.tempCust.setStatus('Completed'); }
+
+        // Meter type & last values
+        if (this.tempCustomer.GasType == 1 && this.tempCustomer.Electricitytype == 1)
+        {
+          this.tempCust.setType(2);
+          this.tempCust.setLastG(this.invoicesList[0].GasAmount);
+          this.tempCust.setLastE(this.invoicesList[0].ElectricityType);
+
+        } else if (this.tempCustomer.GasType == 1 && this.tempCustomer.Electricitytype == 0)
+        {
+          this.tempCust.setType(0);
+          this.tempCust.setLastG(this.invoicesList[0].GasAmount);
+
+        } else
+        {
+          this.tempCust.setType(1);
+          this.tempCust.setLastE(this.invoicesList[0].ElectricityType);
+
+        }
+
+        this.custArr.push(this.tempCust);
+
+
+      });
+
+    this.service.clientList = this.custArr;
+*/
+  }
+}


remove if unused

DrunkenToast · 2022-05-18T12:54:55Z

@@ -0,0 +1,16 @@
+<div *ngFor="let customer of custArr; let i = index" class="md:flex m-4 p-2 pl-4 pr-4 rounded-2xl bg-slate-200 text-slate-300 drop-shadow-md block items-center justify-between">
+    <div class="bg-slate-500 drop-shadow-md rounded-2xl p-2 pr-4 pl-4 mr-2">
+        <p>{{custArr[i].name}}</p>


customer.name and remove let i = index

DrunkenToast · 2022-05-18T12:56:25Z

+  selectCustomer(i : number): void{
+    this.cData.selectedCust = i;
+    if(this.cData.custData[i].status != "done")this.cData.custData[i].status = "in progress"
+    for (let i = 0; i < this.cData.custData.length; i++) {
+      if(this.cData.custData[i] != this.cData.custData[this.cData.selectedCust]){
+        if(this.cData.custData[i].status != "done") this.cData.custData[i].status = "not done";
+      }
+    }
+  }


Output event to parent

DrunkenToast · 2022-05-18T12:57:15Z

+      if(this.cData.custData[i] != this.cData.custData[this.cData.selectedCust]){
+        if(this.cData.custData[i].status != "done") this.cData.custData[i].status = "not done";


&& and use enums for statuses.

DrunkenToast · 2022-05-18T12:57:51Z

+  name : string; 
+  adr : string;
+  mtype : number;
+
+  gMeter : number;
+  eMeter : number;
+  nDate : any;
+
+  fixedDateE: any = new Date();
+  fixedDateG: any = new Date();
+  isDone:boolean;


use interfaces for meters

DrunkenToast · 2022-05-18T12:58:39Z

+<div class="h-screen border-2 border-purple-600 flex justify-center items-center">
+    <div class="w-full max-w-xs">
+        <form class="bg-slate-300 shadow-md rounded px-8 pt-6 pb-8">
+          <div class="mb-4">
+            <input class="shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight" id="username" type="text" placeholder="Username">
+          </div>
+          <div class="mb-6">
+            <input class="shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 mb-3 leading-tight" id="password" type="password" placeholder="Password">
+          </div>
+          <div class="flex items-center justify-center">
+            <button (click)="login()" class="bg-slate-600 hover:bg-slate-200 text-white font-bold py-2 px-4 rounded" type="button">
+              Sign In
+            </button>
+          </div>
+        </form>
+      </div>
+</div>


We already have a login page for literally everybody to use. Do not make your own.

DrunkenToast · 2022-05-18T12:59:33Z

+  goPage1(): void{
+    this.displayPage = 1;
+  }
+  goPage2(): void{
+    this.displayPage = 2;
+  }
+}


Dont make pages this way.

New interfaces used for the data Update some of the page to work with the worker app service

This reverts commit 4c43dcb.

… workerApp

Stuff to interact with the api It's all commented cuz it doesn't work.

… workerApp

Prepare the routes for the api. I don't think these are good tho, please someone else take a look

DrunkenToast · 2022-06-11T12:15:48Z

+export class
+{
+    planningID: number;
+    contractID: number;
+    planningStatus: number;
+
+
+}


Use interfaces instead

DrunkenToast · 2022-06-11T12:18:13Z

+            <div class="bg-slate-500 drop-shadow-md rounded-2xl p-2 pr-4 pl-4 mr-2">
+                {{custArr[i].planningStatus}}
+            </div>
+            <button (click)="selectCustomer(i); this.parent?.parent?.goPage2();" class="bg-slate-500 drop-shadow-md rounded-2xl md:mt-0 mt-2 p-2 pr-4 pl-4">Go ></button>


Instead of these functions, make separate components and routes like we saw in the angular course.

DrunkenToast · 2022-06-11T12:18:45Z

+})
+
+export class CientPageComponent implements OnInit {
+  @Input() parent ?: WorkerappComponent;


this seems like a horrible idea

DrunkenToast · 2022-06-11T12:19:04Z

+    let valid = true;
+    //0 = gas 1 = elek 2 = both
+    if(this.nDate != 'Invalid Date'){
+      this.cData.custData[this.cData.selectedCust].nextDate = this.nDate;
+      console.log("Next meeting: " + this.cData.custData[this.cData.selectedCust].nextDate);
+    }
+    else console.log("Automatically plan next check-up")
+    this.cData.custData[this.cData.selectedCust].nextDate = this.nDate;
+    switch (this.cData.custData[this.cData.selectedCust].meterType) {
+      case 0:
+        if((this.eMeter >= this.cData.custData[this.cData.selectedCust].lastMetingE) && (this.eMeter != 0)){
+          console.log("submitted " + this.eMeter);
+          this.cData.custData[this.cData.selectedCust].newMetingE = this.eMeter;
+        }
+        else{
+          console.log("no valid data");
+          valid = false;
+        } 
+        break;
+      case 1:
+        if((this.gMeter >= this.cData.custData[this.cData.selectedCust].lastMetingG) && (this.gMeter != 0)){
+          console.log("submitted " + this.gMeter);
+          this.cData.custData[this.cData.selectedCust].newMetingG = this.gMeter;
+        }
+        else{
+          console.log("no valid data");
+          valid = false;
+        }
+        break;
+      case 2:
+        if((this.gMeter >= this.cData.custData[this.cData.selectedCust].lastMetingG) && (this.gMeter != 0)){
+          console.log("submitted " + "elek: " + this.eMeter + " gas: " + this.gMeter);
+          this.cData.custData[this.cData.selectedCust].newMetingG = this.gMeter;
+        }
+        else if((this.eMeter >= this.cData.custData[this.cData.selectedCust].lastMetingE) && (this.eMeter != 0)){
+          console.log("submitted " + "elek: " + this.eMeter + " gas: " + this.gMeter);
+          this.cData.custData[this.cData.selectedCust].newMetingE = this.eMeter;
+        }
+        else{
+          console.log("no valid data")
+          valid = false;
+        }
+        break;
+      default:
+        console.log("broken");
+        break;
+    }
+    if(valid){
+      this.cData.custData[this.cData.selectedCust].status = 'done';
+    };
+
+    */
+  }
+}
+


remove if unused

I've updated the api stuff a bit Feel like this code will fall apart rather quickly tho

Updated the routes again

Added the postNewConsumption function to the service

don't use it so don't need it ey

also moved some stuff and added some comments on the worker-app.service.ts file

This reverts commit 3cd8a01, reversing changes made to 214eb3c.

idk man, this is all just a lot of bullshit tbh

Azety added 10 commits May 17, 2022 11:01

new branch

c8b8b0e

util

ed1ffb4

nog altij kpot

d0a21fc

no errors?

d48b3d8

???

06e58de

This reverts commit 2650d0d.

ff9fd21

???

6078839

bro wtf

971c554

bro wtf

be06679

scuffed ma t werkt

4c43dcb

DrunkenToast suggested changes May 18, 2022

View reviewed changes

sdd2001 and others added 6 commits May 18, 2022 17:05

Workerservice update

bfba5ea

New interfaces used for the data Update some of the page to work with the worker app service

not used

3d0fbc9

Revert "scuffed ma t werkt"

d40e029

This reverts commit 4c43dcb.

k

5d5e3c8

werkt

40bdbba

Merge branch 'workerApp' of https://github.com/tm-pe2/ad-website into…

07c6f36

… workerApp

Azety force-pushed the workerApp branch from 9118fd7 to bfba5ea Compare May 18, 2022 16:18

Azety and others added 12 commits May 18, 2022 20:06

:')

defa8c9

ups

c2b5d49

2

c0efe9e

Merge branch 'main' into workerApp

8ddce3b

Merge branch 'workerApp' of https://github.com/tm-pe2/ad-website into…

2070620

… workerApp

Merge branch 'workerApp' of https://github.com/tm-pe2/ad-website into…

9fa2d64

… workerApp

efkes merge check

3acaa6b

Merge branch 'workerApp' of https://github.com/tm-pe2/ad-website into…

ac5c679

… workerApp

L

cbca24b

e

f0823f8

details details

9337a66

uwu

8851df8

Azety and others added 8 commits May 18, 2022 21:46

Merge branch 'main' into workerApp

c22749b

????????

2018ebf

Merge branch 'main' into workerApp

c9bb900

Worker app api stuff

d4be1a0

Stuff to interact with the api It's all commented cuz it doesn't work.

Merge branch 'workerApp' of https://github.com/tm-pe2/ad-website into…

d547c06

… workerApp

kokoj

9c26a3c

ff

002d493

prepare routes

1ad441d

Prepare the routes for the api. I don't think these are good tho, please someone else take a look

DrunkenToast suggested changes Jun 11, 2022

View reviewed changes

sdd2001 and others added 10 commits June 12, 2022 17:22

routes preparing

d6cd08f

I've updated the api stuff a bit Feel like this code will fall apart rather quickly tho

API routes ver3

a73bf69

Updated the routes again

postNewConsumption function

95b5b38

Added the postNewConsumption function to the service

Merge branch 'main' into workerApp

615f640

Delete worker-interfaces.ts

5a5f3a8

don't use it so don't need it ey

Deleted unused files

214eb3c

also moved some stuff and added some comments on the worker-app.service.ts file

Merge branch 'main' into workerApp

3cd8a01

Revert "Merge branch 'main' into workerApp"

a679a1d

This reverts commit 3cd8a01, reversing changes made to 214eb3c.

wa errors minder

2c26387

unused yeet

caf7c28

Azety force-pushed the workerApp branch from e0400d3 to caf7c28 Compare June 15, 2022 17:42

More routes stuff

8056d0d

idk man, this is all just a lot of bullshit tbh

		@@ -0,0 +1,3 @@
		<div class="bg-slate-300 m-3 drop-shadow-md h-fit rounded-lg p-3" id="list">
		<app-list-element [parent]="this"></app-list-element>

		if(this.cData.custData[i] != this.cData.custData[this.cData.selectedCust]){
		if(this.cData.custData[i].status != "done") this.cData.custData[i].status = "not done";

Uh oh!

Conversation

Azety commented May 17, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DrunkenToast left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Azety commented May 17, 2022 •

edited

Loading