Merge pull request #116 from Worxstr/HF/refactor_again

Refactor again

Author: sippejw

src/components/ContactForm.vue

@@ -79,7 +79,7 @@ v-form.flex-grow-1.d-flex.flex-column(
       label="Number of managers",
       type="number",
       min="1",
-      :items='employeeCountOptions'
+      :items='contractorCountOptions'
       outlined,
       dense,
       :color="color",
@@ -90,7 +90,7 @@ v-form.flex-grow-1.d-flex.flex-column(
       label="Number of contractors",
       type="number",
       min="1",
-      :items='employeeCountOptions'
+      :items='contractorCountOptions'
       outlined,
       dense,
       :color="color",
@@ -136,7 +136,7 @@ export default class ContactForm extends Vue {
     email: emailRules,
   }
 
-  employeeCountOptions = [{
+  contractorCountOptions = [{
     text: '0-25',
     value: 0
   },{

src/definitions/Clock.ts

@@ -3,13 +3,13 @@ export type ClockEvent = {
 	action: number;
 	time: string;
 	timecard_id: number;
-	employee_id: number;
+	contractor_id: number;
 }
 
 export type Timecard = {
 	approved: boolean;
 	denied: boolean;
-	employee_id: number;
+	contractor_id: number;
 	fees_payment: string;
 	first_name: string;
 	last_name: string;

src/definitions/Job.ts

@@ -18,16 +18,16 @@ export type Job = {
 	longitude: number;
 	organization_id: number;
 	organization_manager: number;
-	employee_manager_id: number;
+	contractor_manager_id: number;
 	shifts: Shift[];
-	employees: User[];
+	contractors: User[];
 	managers: User[];
 }
 
 export type Shift = {
 	id: number;
-	employee: User;
-	employee_id: number;
+	contractor: User;
+	contractor_id: number;
 	site_location: string;
 	time_begin: string;
 	time_end: string;

src/definitions/Schedule.ts

@@ -3,7 +3,7 @@ import { ClockEvent } from "./Clock";
 export type CalendarEvent = {
     id: number;
     job_id: number;
-    employee_id: number;
+    contractor_id: number;
     site_location: string;
     time_begin: string;
     time_end: string;

src/main.ts

@@ -74,7 +74,7 @@ function initDarkMode() {
 function promptSSN() {
   // If SSN isn't set, need_info flag will be true. Prompt user to enter SSN
   const user = store.state.authenticatedUser
-  if (user && user.employee_info?.need_info) {
+  if (user && user.contractor_info?.need_info) {
     store.dispatch("showSnackbar", {
       text: `You haven't set your Social Security number.`,
       action: () => {

src/store/index.ts

@@ -477,7 +477,7 @@ const storeConfig: StoreOptions<RootState> = {
           manager_id: state.authenticatedUser?.manager_id
         }
       })
-      data.employee_managers.forEach((m: User) => {
+      data.contractor_managers.forEach((m: User) => {
         commit('ADD_MANAGER', { type: 'contractor', manager: m })
       })
       data.organization_managers.forEach((m: User) => {
@@ -568,7 +568,7 @@ const storeConfig: StoreOptions<RootState> = {
     async loadWorkforce({ commit }) {
       const { data } = await axios({
         method: 'GET',
-        url: `${baseUrl}/users/employees`
+        url: `${baseUrl}/users/contractors`
       })
       data.users.forEach((u: User) => {
         commit('ADD_USER', u)
@@ -587,7 +587,7 @@ const storeConfig: StoreOptions<RootState> = {
     async addContractor({ commit }, contractor) {
       const { data } = await axios({
         method: 'POST',
-        url: `${baseUrl}/users/add-employee`,
+        url: `${baseUrl}/users/add-contractor`,
         data: contractor
       })
     },

src/views/jobs/CloseJobDialog.vue

@@ -32,7 +32,7 @@ export default class CloseJobDialog extends Vue {
 
   @Prop({ default: false }) readonly opened!: boolean
   @Prop(Object) readonly job: Job | undefined
-  @Prop(String) readonly employeeName: string | undefined
+  @Prop(String) readonly contractorName: string | undefined
 
   closeDialog() {
     this.$emit('update:opened', false);

src/views/jobs/DeleteShiftDialog.vue

@@ -7,7 +7,7 @@ v-dialog(
 )
   v-card.d-flex.flex-column
     v-card-title.headline Delete shift {{shift.id}}?
-    v-card-text {{ employeeName }} will no longer work this shift.
+    v-card-text {{ contractorName }} will no longer work this shift.
 
     v-spacer
 
@@ -32,7 +32,7 @@ export default class DeleteShiftDialog extends Vue {
 
   @Prop({ default: false }) readonly opened!: boolean
   @Prop(Object) readonly shift: Shift | undefined
-  @Prop(String) readonly employeeName: string | undefined
+  @Prop(String) readonly contractorName: string | undefined
 
   closeDialog() {
     this.$emit("update:opened", false);

src/views/jobs/EditShiftDialog.vue

@@ -28,7 +28,7 @@ v-dialog(
         v-select(
           autofocus
           v-model="editedShift.contractor_ids",
-          :items="employees",
+          :items="contractors",
           :item-text="(e) => (e.id > 0 ? `${e.first_name} ${e.last_name}` : `Unassigned ${-e.id}`)",
           :item-value="'id'",
           outlined,

src/views/jobs/Job.vue

@@ -16,12 +16,12 @@ div(v-else)
     edit-shift-dialog(
       :create="true",
       :opened.sync="addShiftDialog",
-      :contractors="job.employees"
+      :contractors="job.contractors"
     )
     edit-shift-dialog(
       :opened.sync="editShiftDialog",
       :shift.sync="selectedShift",
-      :contractors="job.employees"
+      :contractors="job.contractors"
     )
     delete-shift-dialog(
       v-if="selectedShift",
@@ -67,7 +67,7 @@ div(v-else)
 
         .flex-grow-1.px-5
           p.text-subtitle-2.mb-1 Contractor manager
-          p {{ job.employee_manager | fullName }}
+          p {{ job.contractor_manager | fullName }}
 
         .flex-grow-1.px-5
           p.text-subtitle-2.mb-1 Consultant
@@ -197,8 +197,8 @@ export default class JobView extends Vue {
   }
 
   contractorName(contractorId: number) {
-    if (!this.job.employees) return ''
-    const contractor = this.job.employees.find((e) => e.id == contractorId)
+    if (!this.job.contractors) return ''
+    const contractor = this.job.contractors.find((e) => e.id == contractorId)
     if (!contractor) return 'Unknown contractor'
     return `${contractor.first_name} ${contractor.last_name}`
   }