bcgov · arungmani-aot · Feb 15, 2021
diff --git a/api/src/app/routes/client/controllers/contact.controller.ts b/api/src/app/routes/client/controllers/contact.controller.ts
@@ -42,7 +42,6 @@ export const saveContactAction = async (ctx: Koa.Context) => {
       if (contacts[index].contactType === 'clientcontact') {
         isClientContactExist = true;
       }
-      console.log(contacts[index].id);
       if (!contacts[index].id || contacts[index].id === undefined) {
         contacts[index].id = undefined;
         contacts[index].contactType = 'clientcontact';

diff --git a/api/src/app/routes/client/controllers/financeCode.controller.ts b/api/src/app/routes/client/controllers/financeCode.controller.ts
@@ -24,7 +24,6 @@ export const saveFinanceCodes = async (ctx: Koa.Context) => {
 export const updateFinanceCode = async (ctx: Koa.Context) => {
   try {
     const body = ctx.request.body;
-    console.log(body);
     ctx.body = await updatFinanceCodes(body.FinanceCodes.id, body.FinanceCodes);
   } catch (err) {
     ctx.throw(err.message);

diff --git a/api/src/app/routes/client/controllers/ministry.controller.ts b/api/src/app/routes/client/controllers/ministry.controller.ts
@@ -39,9 +39,7 @@ export const getMinistryById = async (ctx: Koa.Context) => {
 export const updateMinistryActionById = async (ctx: Koa.Context) => {
   try {
     const ministry = ctx.request.body;
-    console.log('updateMinistryAction called', { ministry });
     const ret = await updateMinistry(ministry);
-    console.log('updateMinistryAction done', {ret})
     ctx.body = 'success';
   } catch (err) {
     ctx.throw(err.message)

diff --git a/api/src/app/routes/client/controllers/procurement.controller.ts b/api/src/app/routes/client/controllers/procurement.controller.ts
@@ -32,7 +32,6 @@ export const saveProcurementLog = async (ctx: Koa.Context) => {
 export const updateProcurementLog = async (ctx: Koa.Context) => {
   try {
     const body = ctx.request.body;
-    console.log(body);
     ctx.body = await updateProcLog(body.procurementlog.id, body.procurementlog);
   } catch (err) {
     ctx.throw(err.message);

diff --git a/api/src/app/routes/client/controllers/projectNote.controller.ts b/api/src/app/routes/client/controllers/projectNote.controller.ts
@@ -29,16 +29,6 @@ export const saveProjectNotes = async (ctx: Koa.Context) => {
   }
 };
 
-// export const updateProcurementLog = async (ctx: Koa.Context) => {
-//   try {
-//     const body = ctx.request.body;
-//     console.log(body);
-//     ctx.body = await updateProcLog(body.procurementlog.id, body.procurementlog);
-//   } catch (err) {
-//     ctx.throw(err.message);
-//   }
-// };
-
 export const getAllProjectNotes = async (ctx: Koa.Context) => {
   try {
     // TODO - If user is NOT admin, return only the sheets by user id?

diff --git a/api/src/app/routes/client/controllers/rfxPhase.controller.ts b/api/src/app/routes/client/controllers/rfxPhase.controller.ts
@@ -42,7 +42,6 @@ export const saveRfxPhase = async (ctx: Koa.Context) => {
 export const rfxPhaseUpdate = async (ctx: Koa.Context) => {
   try {
     const body = ctx.request.body;
-    console.log(body);
     ctx.body = await updateRfxPhase(body.RfxPhase.id, body.RfxPhase);
   } catch (err) {
     ctx.throw(err.message);

diff --git a/api/src/app/routes/client/controllers/rfxType.controller.ts b/api/src/app/routes/client/controllers/rfxType.controller.ts
@@ -42,7 +42,6 @@ export const saveRfxType = async (ctx: Koa.Context) => {
 export const rfxTypeUpdate = async (ctx: Koa.Context) => {
   try {
     const body = ctx.request.body;
-    console.log(body);
     ctx.body = await updateRfxType(body.RfxType.id, body.RfxType);
   } catch (err) {
     ctx.throw(err.message);

diff --git a/api/src/app/routes/client/controllers/timesheet.controller.ts b/api/src/app/routes/client/controllers/timesheet.controller.ts
@@ -58,7 +58,6 @@ export const timesheetEntries = async (ctx: Koa.Context) => {
       ctx.throw('no data Found');
       return;
     }
-    console.log(model);
     ctx.body = await retrieveTimesheetByUserAndDate(model);
   } catch (err) {
     ctx.throw(err.message);
@@ -72,7 +71,6 @@ export const timeEntryByUser = async (ctx: Koa.Context) => {
       ctx.throw('no data Found');
       return;
     }
-    console.log(model);
     ctx.body = await retrieveForLightTimesheetByUser(model);
   } catch (err) {
     ctx.throw(err.message);
@@ -160,8 +158,6 @@ export const createBatchTimesheet = async (ctx: Koa.Context) => {
       }
       let timesheet = await retrieveForLightTimesheet(model);
 
-      console.log('createLightTimesheet, does timesheet exist?', { timesheet });
-
       let timesheetId: string;
       if (timesheet) {
         timesheetId = timesheet.id;
@@ -171,9 +167,6 @@ export const createBatchTimesheet = async (ctx: Koa.Context) => {
         model.createdUserId = auth.userId;
 
         timesheet = await createTimesheet(model);
-        console.log('createLightTimesheet, CREATED new timesheet', {
-          timesheet
-        });
         timesheetId = timesheet.id;
         model.id = timesheetId;
       }
@@ -263,8 +256,6 @@ export const createLightTimesheet = async (ctx: Koa.Context) => {
 
     let timesheet = await retrieveForLightTimesheet(model);
 
-    console.log('createLightTimesheet, does timesheet exist?', { timesheet });
-
     let timesheetId: string;
     if (timesheet) {
       timesheetId = timesheet.id;
@@ -274,7 +265,6 @@ export const createLightTimesheet = async (ctx: Koa.Context) => {
       model.createdUserId = auth.userId;
 
       timesheet = await createTimesheet(model);
-      console.log('createLightTimesheet, CREATED new timesheet', { timesheet });
       timesheetId = timesheet.id;
       model.id = timesheetId;
     }

diff --git a/api/src/app/services/client/intake.service.ts b/api/src/app/services/client/intake.service.ts
@@ -74,8 +74,6 @@ export const updateIntake = async (id: string, fields: any) => {
   const updatedIntake = await repo.merge(intake, fields);
   updatedIntake.dateModified = new Date();
 
-  console.log('\n\nupdateIntake in service', fields);
-
   await repo.save(updatedIntake);
   return updatedIntake;
 };

diff --git a/api/src/app/services/client/mou.service.ts b/api/src/app/services/client/mou.service.ts
@@ -50,6 +50,5 @@ export const assignProjectToMOU = async (obj) => {
   const id_todo = '1';
   // const proj = await retrieveProjectById(id_todo)
   // projs.mouID = '999'
-  console.log('assignProjectToMOU, TODO TEST ME!');
   const status = await updateProject(id_todo, { mouID: 999 });
 };
diff --git a/api/src/app/services/client/timesheet.service.ts b/api/src/app/services/client/timesheet.service.ts
@@ -109,7 +109,6 @@ export const retrieveForLightTimesheet = async (model) => {
 };
 export const retrieveForLightTimesheetByUser = async (model) => {
   const repo = timesheetRepo();
-  console.log('model', model);
   const res = await repo
     .createQueryBuilder('t')
     .innerJoinAndSelect('t.projectRfx', 'pr')

diff --git a/api/src/app/services/client/user.service.ts b/api/src/app/services/client/user.service.ts
@@ -40,7 +40,6 @@ export const retrieveUserByReferenceId = async (id: string) => {
 };
 
 export const retrieveUsersNameAndIdByRole = async (roles: string[]) => {
-  // console.log('retrieveUsersNameAndIdByRole start - ', roles)
 
   const repo = userRepo();
   const users = await repo
@@ -58,9 +57,6 @@ export const retrieveUsersNameAndIdByRole = async (roles: string[]) => {
     .orderBy('c.fullName', 'ASC')
     .getMany();
 
-  // console.log('retrieveUsersNameAndIdByRole B -', { repo, users })
-  // console.log('retrieveUsersNameAndIdByRole B -')
-
   const kcAdminToken = await retrieveKeycloakAdminToken();
   // ARC - ERROR OCCURS ABOVE
   // console.log('retrieveUsersNameAndIdByRole C - after adminToken', { kcAdminToken })

diff --git a/api/src/app/services/common/auth-verification.service.ts b/api/src/app/services/common/auth-verification.service.ts
@@ -90,11 +90,9 @@ export const validateToken = async (
     } else {
       // there is no token, don't process request further
       ctx.status = HttpStatus.UNAUTHORIZED;
-      console.log('ARC Unauthorized 2 - changed');
     }
   } catch (error) {
     ctx.status = HttpStatus.UNAUTHORIZED;
-    console.log('ARC Unauthorized 3');
     throw error;
   }
 };
@@ -162,15 +160,10 @@ export const retrieveKeycloakUsersByRole = async (
 const verifyAndCreateOrUpdateUser = async (authData: IAuth, data: any) => {
   const user = await retrieveUserByReferenceId(data.sub);
   if (!user) {
-    console.log(
-      'ARC - User does not exist, creating contact with nam: ',
-      authData.fullName
-    );
     const contact: any = await createContact(<IContact>{
       fullName: authData.fullName,
       contactType: 'user',
     });
-    console.log('ARC - Created contact.  ID: ', contact.id);
     const createdUser = await createUser(<IUser>{
       referenceId: authData.referenceId,
       role: authData.role[0],
@@ -179,7 +172,6 @@ const verifyAndCreateOrUpdateUser = async (authData: IAuth, data: any) => {
       },
     });
     authData.userId = createdUser.id;
-    console.log('ARC - Created user ID:', createdUser.id);
   } else {
     if (user.role?user.role:'' !== authData.role[0]) {
       await updateUser(user.id, { role: authData.role[0] });

diff --git a/web/src/components/error/Unauthorized.vue b/web/src/components/error/Unauthorized.vue
@@ -50,7 +50,6 @@ export default {
     setTimeout(() => {
       clearInterval(timer);
       // this.$router.push('/logout');
-      console.log('LOGOUT TODO');
     }, 5000);
   },
 };

diff --git a/web/src/components/timeMachine/projectIntake/IntakeFormsTable.vue b/web/src/components/timeMachine/projectIntake/IntakeFormsTable.vue
@@ -219,8 +219,6 @@ export default {
   },
   computed: {
     intakeRequests() {
-      // console.log('intakeRequests', this.$store.state.intakeRequests);
-
       return this.$store.state.intakeRequests;
     },
     userList() {
@@ -250,7 +248,7 @@ export default {
       this.dialog = true;
     },
     async approveRequest(id) {
-      const selectedCategory = await this.$refs.selectCategory.open();     
+      const selectedCategory = await this.$refs.selectCategory.open();
       if (selectedCategory) {
           this.$store.dispatch('approveIntakeRequest', { id, categoryId: selectedCategory }).then(() => {
             this.$store.dispatch('fetchIntakeRequests');
@@ -405,7 +403,6 @@ export default {
         const project = this.mouProject;
         project.mou = { id: mouID, name: this.mou };
         const projResponse = await this.$store.dispatch('updateIntakeRequest', project);
-        // console.log('assignMOU projResponse', {projResponse});
 
         this.fetchData();
         this.mouDialog = false;

diff --git a/web/src/components/timeMachine/projects/ProjectCalendarMonth.vue b/web/src/components/timeMachine/projects/ProjectCalendarMonth.vue
@@ -72,7 +72,6 @@ export default {
   },
   methods: {
     reset() {
-      console.log('hi its working');
     },
     disableWeekPicker(flag = false) {
       this.disabledatepicker = flag;

diff --git a/web/src/components/timeMachine/timesheets/AddTimeRecord.vue b/web/src/components/timeMachine/timesheets/AddTimeRecord.vue
@@ -7,7 +7,7 @@
       content-class="add-time-record"
       v-model="dialog"
       @input="closeDialog(false)"
-    >  
+    >
       <v-form ref="AddimeRecords" v-model="valid" lazy-validation>
         <spinner ref="spinner"></spinner>
         <v-card>
@@ -330,11 +330,10 @@ export default {
       return sum;
     },
     selectedProject() {
-      console.log("selectedProject");
       if (this.form && this.form.mou && this.form.project) {
         const selectedProject = this.userMouProjects.filter(item => item.id === this.form.project);
         if (selectedProject[0]) {
-          const project = selectedProject[0];      
+          const project = selectedProject[0];
           return{
             mouAmount: project.mouAmount.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','),
             totalBilledAmount: project.totalAmountBilled.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','),
@@ -409,7 +408,7 @@ export default {
       if (this.$refs.spinner) {
         this.$refs.spinner.close();
       }
-      
+
       return vm.userMouProjects;
     },
     onChangeMou(editMode) {

diff --git a/web/src/store/index.js b/web/src/store/index.js
@@ -24,7 +24,6 @@ import HashTable from "@/utils/HashTable";
 import RFxDto from "@/domain/models/RFx.dto";
 
 const API_URI = process.env.VUE_APP_API_URI || "http://localhost:3000";
-console.log("API URL:", { API_URI });
 
 Vue.use(Vuex);
 
@@ -252,7 +251,6 @@ const store = new Vuex.Store({
       throw new Error("Not implemented!");
     },
     addMinistry(state, data) {
-      console.log("TODO - NOT SURE IF COMPLETE - addMinistry MUTATION called", { state, data });
       // state.ministries = data;
       // throw new Error('Not implemented');
     },
@@ -301,7 +299,6 @@ const store = new Vuex.Store({
       throw new Error("Not implemented!");
     },
     createMOU(state, data) {
-      console.log("createMOU mutation", data);
       // state.mouList = data;
       state.mouList.push(data);
     },
@@ -378,7 +375,6 @@ const store = new Vuex.Store({
     // Project RFx
     fetchProjectRFxData(state, data) {
       // if it's an empty array, need to add blank rfX type
-      console.log("fetchProjectRFxData", { data });
       if (data && data.length === 0) {
         data.push(new RFxDto());
       }
@@ -484,7 +480,7 @@ const store = new Vuex.Store({
       throw new Error("Not implemented!");
     },
     archiveProject(state, data) {
-      console.log("archiveProject response", data);
+
     }
   },
   /**
@@ -536,7 +532,6 @@ const store = new Vuex.Store({
     fetchAllFinanceCodes(ctx) {
       $http.get(`${API_URI}/financecode/all`).then(res => {
         const content = res.data;
-        console.log("fincodes:", content);
         ctx.commit("fetchAllFinanceCodes", content);
       });
     },
@@ -556,7 +551,6 @@ const store = new Vuex.Store({
       const api = await $http
         .patch(`${API_URI}/ministry/${req.id}/update`, req)
         .then(res => {
-          console.log("updateMinistires RESPONSE", { res });
           return Promise.resolve(res.data);
         })
         .catch(err => Promise.reject(err));
@@ -819,7 +813,6 @@ const store = new Vuex.Store({
         .post(`${API_URI}/MOU`, body)
         .then(res => {
           const content = res.data;
-          console.log("createMOU called with body", body);
           ctx.commit("createMOU", content);
           return Promise.resolve(content);
         })
@@ -877,7 +870,6 @@ const store = new Vuex.Store({
     },
 
     async updateProctLog(ctx, req) {
-      console.log(req);
       const api = $http
         .patch(`${API_URI}/procurement/${req.id}`, req)
         .then(res => {
@@ -889,7 +881,6 @@ const store = new Vuex.Store({
       return Promise.resolve(api);
     },
     async updateFinanceCodes(ctx, req) {
-      console.log("reqq:", req);
       const api = $http
         .patch(`${API_URI}/financecode/${req.id}`, req)
         .then(res => {