CaWittMN08/custom_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge conflict.

Browse Source
This commit is contained in:
rocketdebris 2025-11-06 16:14:07 -05:00
parent 40c4a5a37f
commit 616fa1be79
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
frontend/src/api.js
View File

@ -178,10 +178,6 @@ class Api {
} }
static async getJobDetails() { static async getJobDetails() {
//const data = DataUtils.dummyJobData.map((job) => ({
// ...job,
// stepProgress: DataUtils.calculateStepProgress(job.steps),
//}));
const projects = await this.getDocsList("Project"); const projects = await this.getDocsList("Project");
const data = []; const data = [];
for (let prj of projects) { for (let prj of projects) {
@ -207,6 +203,14 @@ class Api {
static async getRouteData() { static async getRouteData() {
const data = DataUtils.dummyRouteData; const data = DataUtils.dummyRouteData;
//const data = [];
const routes = getDocList("Pre-Built Routes");
for (const rt of routes) {
route = getDetailedDoc("Pre-Built Routes", rt.name);
let tableRow = {
};
}
console.log("DEBUG: API - getRouteData result: ", data); console.log("DEBUG: API - getRouteData result: ", data);
return data; return data;
} }
@ -218,7 +222,22 @@ class Api {
} }
static async getTimesheetData() { static async getTimesheetData() {
const data = DataUtils.dummyTimesheetData; //const data = DataUtils.dummyTimesheetData;
const data = [];
const timesheets = await this.getDocsList("Timesheet");
for (const ts of timesheets) {
const timesheet = await this.getDetailedDoc("Timesheet", ts.name);
const tableRow = {
timesheetId: timesheet.name,
employee: timesheet.employee_name,
date: timesheet.date,
customer: timesheet.customer,
totalHours: timesheet.total_hours,
status: timesheet.status,
totalPayFormatted: timesheet.total_costing_amount
}
data.push(tableRow);
}
console.log("DEBUG: API - getTimesheetData result: ", data); console.log("DEBUG: API - getTimesheetData result: ", data);
return data; return data;
} }