(Feat-Fix): New Reporting system, more seeded data, fixed subdepartments and activity inversion, login page changes, etc etc
This commit is contained in:
@@ -12,6 +12,7 @@ export interface User {
|
||||
contractor_name?: string;
|
||||
sub_department_id?: number;
|
||||
sub_department_name?: string;
|
||||
primary_activity?: string;
|
||||
// Common fields for Employee and Contractor
|
||||
phone_number?: string;
|
||||
aadhar_number?: string;
|
||||
@@ -35,9 +36,20 @@ export interface SubDepartment {
|
||||
id: number;
|
||||
department_id: number;
|
||||
name: string;
|
||||
primary_activity: string;
|
||||
created_at: string;
|
||||
updated_at: string;
|
||||
department_name?: string;
|
||||
}
|
||||
|
||||
export interface Activity {
|
||||
id: number;
|
||||
sub_department_id: number;
|
||||
name: string;
|
||||
unit_of_measurement: 'Per Bag' | 'Fixed Rate-Per Person';
|
||||
created_at: string;
|
||||
sub_department_name?: string;
|
||||
department_id?: number;
|
||||
department_name?: string;
|
||||
}
|
||||
|
||||
export interface WorkAllocation {
|
||||
@@ -111,10 +123,43 @@ export interface EmployeeSwap {
|
||||
export interface ContractorRate {
|
||||
id: number;
|
||||
contractor_id: number;
|
||||
sub_department_id?: number;
|
||||
activity?: string;
|
||||
rate: number;
|
||||
effective_date: string;
|
||||
created_at: string;
|
||||
updated_at: string;
|
||||
contractor_name?: string;
|
||||
contractor_username?: string;
|
||||
sub_department_name?: string;
|
||||
department_name?: string;
|
||||
}
|
||||
|
||||
export interface StandardRate {
|
||||
id: number;
|
||||
sub_department_id?: number;
|
||||
activity?: string;
|
||||
rate: number;
|
||||
effective_date: string;
|
||||
created_by: number;
|
||||
created_at: string;
|
||||
sub_department_name?: string;
|
||||
department_name?: string;
|
||||
department_id?: number;
|
||||
created_by_name?: string;
|
||||
}
|
||||
|
||||
export interface RateComparison {
|
||||
id: number;
|
||||
contractor_id: number;
|
||||
contractor_name: string;
|
||||
sub_department_id?: number;
|
||||
sub_department_name?: string;
|
||||
activity?: string;
|
||||
rate: number;
|
||||
standard_rate: number;
|
||||
difference: number;
|
||||
percentage_difference: string | null;
|
||||
is_above_standard: boolean;
|
||||
is_below_standard: boolean;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user