@@ -127,11 +151,9 @@
{{service.vhcl_manuf + ' ' + service.vhcl_model}} ({{service.vhcl_reg}}) |
{{vm.getServiceDate(service.srvc_date)}} |
{{service.srvc_cost}} |
-
{{service.srvc_status}} |
+
{{service.srvc_status}} |
+
{{service.srvc_state}} |
-
- Invoice
-
delete
@@ -148,7 +170,7 @@
card_membership
-
+
{{membership.name}}
diff --git a/src/app/components/dashboard/dashboard.controller-deps.js b/src/app/components/dashboard/dashboard.controller-deps.js
new file mode 100644
index 00000000..01e0559d
--- /dev/null
+++ b/src/app/components/dashboard/dashboard.controller-deps.js
@@ -0,0 +1,284 @@
+/**
+ * Controller for dashboard sub-views
+ * @author ndkcha
+ * @since 0.6.4
+ * @version 0.6.4
+ */
+
+///
+
+(function() {
+ const ammPreferences = require('./automint_modules/am-preferences.js');
+
+ angular.module('automintApp')
+ .controller('amCtrlDashDuPy', DuePaymentsController)
+ .controller('amCtrlDashNwCu', NewCustomerController)
+ .controller('amCtrlDashTmFl', TimeFilterController)
+ .controller('amCtrlDashNxDu', NextDueServicesController);
+
+ DuePaymentsController.$inject = ['$state', '$mdDialog', 'unbilledServices'];
+ NewCustomerController.$inject = ['$mdDialog', 'newCustomers'];
+ TimeFilterController.$inject = ['$mdDialog', '$filter', 'filterRange', 'currentTimeSet'];
+ NextDueServicesController.$inject = ['$state', '$mdDialog', 'amDashboard', 'dueCustomers', 'nsdcTimeRange', 'nsdcTime'];
+
+ function DuePaymentsController($state, $mdDialog, unbilledServices) {
+ // initialize view model
+ var vm = this;
+
+ // named assignments to keep track of UI
+ vm.query = {
+ limit: 20,
+ page: 1,
+ total: unbilledServices.length
+ };
+ // function mappings
+ vm.getServiceDate = getServiceDate;
+ vm.services = unbilledServices;
+ vm.editService = editService;
+ vm.closeDialog = closeDialog;
+
+ // default execution steps
+ vm.services.sort(sortFunction);
+
+ // function definitions
+
+ function sortFunction(lhs, rhs) {
+ return (rhs.srvc_date.localeCompare(lhs.srvc_date));
+ }
+
+ function getServiceDate(date) {
+ return moment(date).format('DD MMM YYYY');
+ }
+
+ // close dialog box
+ function closeDialog() {
+ $mdDialog.hide();
+ }
+
+ // edit service
+ function editService(service) {
+ $mdDialog.hide();
+ $state.go('restricted.services.edit', {
+ serviceId: service.srvc_id,
+ vehicleId: service.vhcl_id,
+ userId: service.cstmr_id,
+ fromState: 'dashboard.duepayments'
+ });
+ }
+ }
+
+ function NewCustomerController($mdDialog, newCustomers) {
+ // initialize view model
+ var vm = this;
+
+ // named assignments to keep track of UI
+ vm.query = {
+ limit: 20,
+ page: 1,
+ total: newCustomers.length
+ };
+ // function mappings
+ vm.customers = newCustomers;
+ vm.closeDialog = closeDialog;
+
+ // function definitions
+
+ // close dialog box
+ function closeDialog() {
+ $mdDialog.hide();
+ }
+ }
+
+ function TimeFilterController($mdDialog, $filter, filterRange, currentTimeSet) {
+ var vm = this;
+
+ vm.currentYearIndex = 0;
+ vm.yearRange = [];
+ vm.selectedDateSet = $.extend([], currentTimeSet);
+
+ // default execution steps
+ populateYearRange();
+
+ // function mappings
+ vm.IsNextYear = IsNextYear;
+ vm.IsPreviousYear = IsPreviousYear;
+ vm.changeToNextYear = changeToNextYear;
+ vm.changeToPreviousYear = changeToPreviousYear;
+ vm.selectDateSet = selectDateSet;
+ vm.IsDateSetSelected = IsDateSetSelected;
+ vm.IsDateSetDisabled = IsDateSetDisabled;
+ vm.confirm = confirm;
+
+ // function definitions
+
+ function confirm() {
+ if (vm.selectedDateSet.length < 1)
+ vm.selectedDateSet = currentTimeSet;
+ $mdDialog.hide(vm.selectedDateSet);
+ }
+
+ function IsDateSetDisabled(month) {
+ var temp_m = moment(month, 'M').format('MMM');
+ var found = $filter('filter')(filterRange, {
+ year: vm.yearRange[vm.currentYearIndex],
+ month: temp_m
+ }, true);
+
+ return (found.length == 0);
+ }
+
+ function IsDateSetSelected(month) {
+ var temp_m = moment(month, 'M').format('MMM');
+ var found = $filter('filter')(vm.selectedDateSet, {
+ year: vm.yearRange[vm.currentYearIndex],
+ month: temp_m
+ }, true);
+
+ return (found.length == 1);
+ }
+
+ function selectDateSet(month) {
+ var temp_m = moment(month, 'M').format('MMM');
+ var found = $filter('filter')(vm.selectedDateSet, {
+ year: vm.yearRange[vm.currentYearIndex],
+ month: temp_m
+ }, true);
+
+ if (found.length == 0) {
+ vm.selectedDateSet.push({
+ year: vm.yearRange[vm.currentYearIndex],
+ month: temp_m
+ });
+ } else {
+ var i = vm.selectedDateSet.indexOf(found[0]);
+ vm.selectedDateSet.splice(i, 1);
+ }
+ }
+
+ function changeToNextYear() {
+ vm.currentYearIndex--;
+ }
+
+ function changeToPreviousYear() {
+ vm.currentYearIndex++;
+ }
+
+ function IsNextYear() {
+ return (vm.currentYearIndex != 0);
+ }
+
+ function IsPreviousYear() {
+ return (vm.currentYearIndex != (vm.yearRange.length - 1));
+ }
+
+ function populateYearRange() {
+ filterRange.forEach(iterateYearRange);
+
+ function iterateYearRange(item) {
+ var found = $filter('filter')(vm.yearRange, item.year, true);
+
+ if (found == 0)
+ vm.yearRange.push(item.year);
+ }
+ }
+ }
+
+ function NextDueServicesController($state, $mdDialog, amDashboard, dueCustomers, nsdcTimeRange, nsdcTime) {
+ // initialize view model
+ var vm = this;
+
+ // named assignments to keep track of UI
+ vm.query = {
+ limit: 20,
+ page: 1,
+ total: dueCustomers.length
+ };
+ vm.nsdcTime = nsdcTime;
+ vm.nsdcTimeRange = nsdcTimeRange
+
+ // function mappings
+ vm.closeDialog = closeDialog;
+ vm.getDate = getDate;
+ vm.openNxtDueTimer = openNxtDueTimer;
+ vm.changeNsdcTimeRange = changeNsdcTimeRange;
+ vm.editCustomer = editCustomer;
+ vm.deleteServiceReminder = deleteServiceReminder;
+ vm.changeDate = changeDate;
+
+ // default execution steps
+ manageCustomers(dueCustomers);
+
+ // function definitions
+
+ function changeDate(customer) {
+ amDashboard.changeServiceReminderDate(customer.cstmr_id, customer.vhcl_id, moment(customer.vhcl_nextdue).format()).then(success).catch(failure);
+
+ function success(res) {
+ setTimeout(changeNsdcTimeRange, 300);
+ }
+
+ function failure(err) {
+ console.warn(err);
+ }
+ }
+
+ function manageCustomers(holder) {
+ holder.forEach(iterateCustomers);
+ vm.customers = holder;
+
+ function iterateCustomers(customer) {
+ customer.vhcl_nextdue = new Date(moment(customer.vhcl_nextdue).format("YYYY"), moment(customer.vhcl_nextdue).format("MM") - 1, moment(customer.vhcl_nextdue).format("DD"));
+ }
+ }
+
+ function deleteServiceReminder(cId, vId) {
+ amDashboard.deleteServiceReminder(cId, vId).then(success).catch(failure);
+
+ function success(res) {
+ setTimeout(changeNsdcTimeRange, 300);
+ }
+
+ function failure(err) {
+ console.warn(err);
+ }
+ }
+
+ function editCustomer(cId) {
+ $state.go('restricted.customers.edit', {
+ id: cId,
+ openTab: 'vehicle',
+ fromState: 'dashboard.nextdueservices'
+ });
+ $mdDialog.hide();
+ }
+
+ function generateNdcData(res) {
+ manageCustomers(res);
+ }
+
+ function changeNsdcTimeRange(time) {
+ if (time != undefined) {
+ vm.nsdcTime = time;
+ ammPreferences.storePreference('dashboard.serviceReminders', vm.nsdcTime);
+ }
+ amDashboard.getNextDueCustomers(vm.nsdcTime).then(generateNdcData).catch(failure);
+
+ function failure(err) {
+ console.warn(err);
+ }
+ }
+
+ function openNxtDueTimer($mdOpenMenu, ev) {
+ $mdOpenMenu(ev);
+ }
+
+ function getDate(date) {
+ return moment(date).format('DD MMM YYYY');
+ }
+
+ // close dialog box
+ function closeDialog() {
+ $mdDialog.hide();
+ }
+ }
+})();
\ No newline at end of file
diff --git a/src/app/components/dashboard/dashboard.controller.js b/src/app/components/dashboard/dashboard.controller.js
index 113c9164..5da341d0 100644
--- a/src/app/components/dashboard/dashboard.controller.js
+++ b/src/app/components/dashboard/dashboard.controller.js
@@ -2,25 +2,22 @@
* Controller for dashboard view
* @author ndkcha
* @since 0.4.1
- * @version 0.6.1
+ * @version 0.6.4
*/
///
(function() {
- angular.module('automintApp')
- .controller('dashboardCtrl', DashboardController)
- .controller('amCtrlDashDuPy', DuePaymentsController)
- .controller('amCtrlDashNwCu', NewCustomerController);
+ const ammPreferences = require('./automint_modules/am-preferences.js');
+
+ angular.module('automintApp').controller('dashboardCtrl', DashboardController);
DashboardController.$inject = ['$state', '$filter', '$log', '$mdDialog', '$amRoot', 'utils', 'amDashboard'];
- DuePaymentsController.$inject = ['$state', '$mdDialog', 'unbilledServices'];
- NewCustomerController.$inject = ['$mdDialog', 'newCustomers'];
function DashboardController($state, $filter, $log, $mdDialog, $amRoot, utils, amDashboard) {
// initialize view model
var vm = this;
- var ubServices = [], nwCustomers = [];
+ var ubServices = [], nwCustomers = [], filterRange = [], isNextDueServicesOpened = false;
// named assignments to keep track of UI
vm.totalCustomersServed = 0;
@@ -79,20 +76,214 @@
}],
rows: []
};
+ vm.currentTimeSet = [];
+ vm.ddTimeSet = '';
+ vm.displayIncome = false;
+ vm.nextServiceDueCustomers = [];
+ vm.nsdcTimeRange = ['Today', 'This Week', 'This Month', 'All'];
+ vm.nsdcTime = vm.nsdcTimeRange[0];
// function maps
vm.addNewService = addNewService;
vm.viewAllServices = viewAllServices;
vm.openDuePayments = openDuePayments;
vm.openNewCustomers = openNewCustomers;
+ vm.openTimeFilter = openTimeFilter;
+ vm.openNxtDueTimer = openNxtDueTimer;
+ vm.changeNsdcTimeRange = changeNsdcTimeRange;
+ vm.getNxtDueField = getNxtDueField;
+ vm.getNextDueVehicle = getNextDueVehicle;
+ vm.IsNextDueFieldLong = IsNextDueFieldLong;
+ vm.openNextDueServices = openNextDueServices;
+ vm.IsNoNextDueReminders = IsNoNextDueReminders;
// default execution steps
+ initCurrentTimeSet();
+ getFilterMonths();
$amRoot.ccViews();
- amDashboard.getTotalCustomerServed().then(generateTcsData).catch(failure);
- amDashboard.getNewCustomers().then(generateNcpData).catch(failure);
- amDashboard.getProblemsAndVehicleTypes().then(sortProblemsAndVehicleTypes).catch(failure);
+ processPreferences();
// function definitions
+
+ function IsNoNextDueReminders() {
+ return (vm.nextServiceDueCustomers.length == 0);
+ }
+
+ function openNextDueServices() {
+ $mdDialog.show({
+ controller: 'amCtrlDashNxDu',
+ controllerAs: 'vm',
+ templateUrl: 'app/components/dashboard/tmpl/dialog_nextdueservices.tmpl.html',
+ parent: angular.element(document.body),
+ targetEvent: event,
+ locals: {
+ dueCustomers: vm.nextServiceDueCustomers,
+ nsdcTimeRange: vm.nsdcTimeRange,
+ nsdcTime: vm.nsdcTime
+ },
+ clickOutsideToClose: true
+ }).then(closeNdsDialog).catch(closeNdsDialog);
+
+ function closeNdsDialog() {
+ ammPreferences.getPreference('dashboard.serviceReminders').then(success).catch(failure);
+
+ function success(res) {
+ changeNsdcTimeRange(res, true);
+ }
+ }
+ }
+
+ function IsNextDueFieldLong(text) {
+ return (text.length > 15);
+ }
+
+ function getNextDueVehicle(manuf, model, reg, long) {
+ var v = (model ? model : (reg ? reg : (manuf ? manuf : '')));
+ var t = (manuf ? manuf : '') + ((manuf || model) ? ' ' : '') + (model ? model : '') + (((manuf || model) && reg) ? ' - ' : '') + (reg ? reg : '');
+ return (long ? t : getNxtDueField(v));
+ }
+
+ function getNxtDueField(text) {
+ return ((text.length <= 15) ? text : text.substr(0, 15) + '...');
+ }
+
+ function changeNsdcTimeRange(time, isStoreBlocked) {
+ vm.nsdcTime = time;
+ amDashboard.getNextDueCustomers(vm.nsdcTime).then(generateNdcData).catch(failure);
+ if (!isStoreBlocked)
+ ammPreferences.storePreference('dashboard.serviceReminders', vm.nsdcTime);
+ }
+
+ function openNxtDueTimer($mdOpenMenu, ev) {
+ $mdOpenMenu(ev);
+ }
+
+ function generateNdcData(res) {
+ vm.nextServiceDueCustomers = res;
+ if (isNextDueServicesOpened) {
+ openNextDueServices();
+ isNextDueServicesOpened = false;
+ }
+ }
+
+ function processPreferences() {
+ ammPreferences.getAllPreferences('viewServices').then(processViewServices).catch(failure);
+ ammPreferences.getAllPreferences('dashboard').then(processDashboard).catch(failure);
+
+ function processDashboard(res) {
+ if ($state.params.openDialog == 'nextdueservices')
+ isNextDueServicesOpened = true;
+ if (res['dashboard.serviceReminders']) {
+ vm.nsdcTime = res['dashboard.serviceReminders'];
+ }
+ changeNsdcTimeRange(vm.nsdcTime, true);
+ }
+
+ function processViewServices(res) {
+ if (res['viewServices.showingDataFor']) {
+ var sdf = res['viewServices.showingDataFor'].split(';');
+ vm.currentTimeSet = [];
+ sdf.forEach(iterateDateRange);
+ displayCurrentTimeSet();
+ }
+
+ amDashboard.getTotalCustomerServed(vm.currentTimeSet).then(generateTcsData).catch(failure);
+ amDashboard.getNewCustomers(vm.currentTimeSet).then(generateNcpData).catch(failure);
+ amDashboard.getProblemsAndVehicleTypes(vm.currentTimeSet).then(sortProblemsAndVehicleTypes).catch(failure);
+
+ function iterateDateRange(dr) {
+ var m = dr.split(',');
+ for (var i = 0; i < (m.length - 1); i++) {
+ vm.currentTimeSet.push({
+ month: moment(m[i].replace(' ', ''), "MMMM").format("MMM"),
+ year: m[m.length - 1].replace(' ', '')
+ });
+ }
+ }
+ }
+
+ function failure(err) {
+ amDashboard.getTotalCustomerServed(vm.currentTimeSet).then(generateTcsData).catch(failure);
+ amDashboard.getNewCustomers(vm.currentTimeSet).then(generateNcpData).catch(failure);
+ amDashboard.getProblemsAndVehicleTypes(vm.currentTimeSet).then(sortProblemsAndVehicleTypes).catch(failure);
+ changeNsdcTimeRange(vm.nsdcTimeRange[0]);
+ console.warn(err.message);
+ }
+ }
+
+ function displayCurrentTimeSet() {
+ vm.ddTimeSet = '';
+ var years = [];
+ vm.currentTimeSet.forEach(iterateTimeSets);
+ years.forEach(iterateYears);
+ vm.ddTimeSet = vm.ddTimeSet.substr(0, vm.ddTimeSet.length - 2);
+
+ function iterateYears(y) {
+ var tyf = $filter('filter')(vm.currentTimeSet, {
+ year: y
+ }, true);
+
+ tyf.forEach(iterateFoundYear);
+ vm.ddTimeSet += y + '; ';
+
+ function iterateFoundYear(fy) {
+ vm.ddTimeSet += moment(fy.month, 'MMM').format('MMMM') + ', ';
+ }
+ }
+
+ function iterateTimeSets(ts) {
+ var tyf = $filter('filter')(years, ts.year, true);
+
+ if (tyf.length == 0)
+ years.push(ts.year);
+ }
+ }
+
+ function initCurrentTimeSet() {
+ vm.currentTimeSet.push({
+ month: moment().format('MMM'),
+ year: moment().format('YYYY')
+ });
+ displayCurrentTimeSet();
+ }
+
+ function getFilterMonths() {
+ amDashboard.getFilterMonths().then(success).catch(failure);
+
+ function success(res) {
+ filterRange = res;
+ }
+
+ function failure(err) {
+ console.info('failed to get filter months');
+ }
+ }
+
+ function openTimeFilter(event) {
+ $mdDialog.show({
+ controller: 'amCtrlDashTmFl',
+ controllerAs: 'vm',
+ templateUrl: 'app/components/dashboard/tmpl/dialog_timefilter.html',
+ parent: angular.element(document.body),
+ targetEvent: event,
+ locals: {
+ filterRange: filterRange,
+ currentTimeSet: vm.currentTimeSet
+ },
+ clickOutsideToClose: true
+ }).then(success).catch(success);
+
+ function success(res) {
+ if (!res)
+ return;
+ vm.currentTimeSet = res;
+ amDashboard.getTotalCustomerServed(vm.currentTimeSet).then(generateTcsData).catch(failure);
+ amDashboard.getNewCustomers(vm.currentTimeSet).then(generateNcpData).catch(failure);
+ amDashboard.getProblemsAndVehicleTypes(vm.currentTimeSet).then(sortProblemsAndVehicleTypes).catch(failure);
+ displayCurrentTimeSet();
+ ammPreferences.storePreference('viewServices.showingDataFor', vm.ddTimeSet);
+ }
+ }
function openDuePayments() {
if (ubServices.length <= 0) {
@@ -152,16 +343,17 @@
Object.keys(res.problems).forEach(iterateProblems);
sp.sort(sortByCount);
for (var i = 0; i < sp.length; i++) {
- if (i == 4) {
+ if (i == 5) {
sortedProblems.push({
name: "Others",
count: sp[i].count
});
- } else if (i > 4)
- sortedProblems[4].count += sp[i].count;
+ } else if (i > 5)
+ sortedProblems[5].count += sp[i].count;
else
sortedProblems.push(sp[i]);
}
+ vm.topTreatmentsChart.data.rows = [];
sortedProblems.forEach(ip);
}
if (res.vehicletypes) {
@@ -178,6 +370,7 @@
else
sortedVehicleTypes.push(svt[i]);
}
+ vm.topVtChart.data.rows = [];
sortedVehicleTypes.forEach(ivt);
}
@@ -236,20 +429,32 @@
function generateTcsData(res) {
var uids = [],
- spd = {};
+ spd = {},
+ dates = [];
vm.totalCustomersServed = 0;
vm.totalRevenueEarned = 0;
vm.totalServicesDone = 0;
res.forEach(iterateServices);
vm.totalRevenueEarned = parseFloat(vm.totalRevenueEarned);
vm.totalRevenueEarned = (vm.totalRevenueEarned % 1 != 0) ? vm.totalRevenueEarned.toFixed(2) : parseInt(vm.totalRevenueEarned);
- if (spd)
+ if (spd) {
+ vm.perDayServiceChart.data.rows = [];
Object.keys(spd).forEach(calculateSpd);
+ }
+ dates.sort(sortDates);
+ vm.perDayServiceChart.options['zoomStartTime'] = dates[0];
+ vm.perDayServiceChart.options['zoomEndTime'] = dates[dates.length - 1];
+
+ function sortDates(lhs, rhs) {
+ return lhs.getTime() - rhs.getTime();
+ }
function calculateSpd(d) {
+ var tempdate = new Date(moment(d, 'DD MMM YYYY').format('YYYY'), moment(d, 'DD MMM YYYY').format('MM') - 1, moment(d, 'DD MMM YYYY').format('DD'));
+ dates.push(tempdate);
vm.perDayServiceChart.data.rows.push({
c: [{
- v: new Date(moment(d, 'DD MMM YYYY').format('YYYY'), moment(d, 'DD MMM YYYY').format('MM') - 1, moment(d, 'DD MMM YYYY').format('DD'))
+ v: tempdate
}, {
v: spd[d]
}]
@@ -275,75 +480,7 @@
}
function failure(err) {
- // console.log(err);
- }
- }
-
- function DuePaymentsController($state, $mdDialog, unbilledServices) {
- // initialize view model
- var vm = this;
-
- // named assignments to keep track of UI
- vm.query = {
- limit: 20,
- page: 1,
- total: unbilledServices.length
- };
- // function mappings
- vm.getServiceDate = getServiceDate;
- vm.services = unbilledServices;
- vm.editService = editService;
- vm.closeDialog = closeDialog;
-
- // default execution steps
- vm.services.sort(sortFunction);
-
- // function definitions
-
- function sortFunction(lhs, rhs) {
- return (rhs.srvc_date.localeCompare(lhs.srvc_date));
- }
-
- function getServiceDate(date) {
- return moment(date).format('DD MMM YYYY');
- }
-
- // close dialog box
- function closeDialog() {
- $mdDialog.hide();
- }
-
- // edit service
- function editService(service) {
- $mdDialog.hide();
- $state.go('restricted.services.edit', {
- serviceId: service.srvc_id,
- vehicleId: service.vhcl_id,
- userId: service.cstmr_id,
- fromState: 'dashboard.duepayments'
- });
- }
- }
-
- function NewCustomerController($mdDialog, newCustomers) {
- // initialize view model
- var vm = this;
-
- // named assignments to keep track of UI
- vm.query = {
- limit: 20,
- page: 1,
- total: newCustomers.length
- };
- // function mappings
- vm.customers = newCustomers;
- vm.closeDialog = closeDialog;
-
- // function definitions
-
- // close dialog box
- function closeDialog() {
- $mdDialog.hide();
+ console.warn(err);
}
}
})();;
\ No newline at end of file
diff --git a/src/app/components/dashboard/dashboard.factory.js b/src/app/components/dashboard/dashboard.factory.js
index bfd74422..a998896d 100644
--- a/src/app/components/dashboard/dashboard.factory.js
+++ b/src/app/components/dashboard/dashboard.factory.js
@@ -2,7 +2,7 @@
* Factory that handles database interactions between dashboard dataset and controller
* @author ndkcha
* @since 0.6.0
- * @version 0.6.0
+ * @version 0.6.4
*/
///
@@ -17,26 +17,153 @@
var factory = {
getTotalCustomerServed: getTotalCustomerServed,
getNewCustomers: getNewCustomers,
- getProblemsAndVehicleTypes: getProblemsAndVehicleTypes
+ getProblemsAndVehicleTypes: getProblemsAndVehicleTypes,
+ getFilterMonths: getFilterMonths,
+ getNextDueCustomers: getNextDueCustomers,
+ deleteServiceReminder: deleteServiceReminder,
+ changeServiceReminderDate: changeServiceReminderDate
}
return factory;
// function definitions
+
+ function changeServiceReminderDate(cId, vId, nextdue) {
+ var tracker = $q.defer();
+ pdbCustomers.get(cId).then(getCustomerDoc).catch(failure);
+ return tracker.promise;
+
+ function getCustomerDoc(res) {
+ res.user.vehicles[vId].nextdue = nextdue;
+ pdbCustomers.save(res).then(success).catch(failure);
+ }
+
+ function success(res) {
+ tracker.resolve(res);
+ }
+
+ function failure(err) {
+ tracker.reject(err);
+ }
+ }
+
+ function deleteServiceReminder(cId, vId) {
+ var tracker = $q.defer();
+ pdbCustomers.get(cId).then(getCustomerDoc).catch(failure);
+ return tracker.promise;
+
+ function getCustomerDoc(res) {
+ delete res.user.vehicles[vId].nextdue;
+ pdbCustomers.save(res).then(success).catch(failure);
+ }
+
+ function success(res) {
+ tracker.resolve(res);
+ }
+
+ function failure(err) {
+ tracker.reject(err);
+ }
+ }
+
+ function getNextDueCustomers(dateRange) {
+ var tracker = $q.defer();
+ pdbCache.get(constants.pdb_cache_views.view_services).then(generateNextDueCustomers).catch(failure);
+ return tracker.promise;
+
+ function generateNextDueCustomers(res) {
+ var startdate, enddate, dateFormat, result = [];
+ switch (dateRange) {
+ case "Today":
+ dateFormat = 'YYYY-MM-DD';
+ startdate = moment().format(dateFormat);
+ enddate = moment().format(dateFormat);
+ break;
+ case "This Week":
+ dateFormat = 'w';
+ startdate = moment().format(dateFormat);
+ enddate = moment().format(dateFormat);
+ break;
+ case "This Month":
+ dateFormat = 'M';
+ startdate = moment().format(dateFormat);
+ enddate = moment().format(dateFormat);
+ break;
+ }
+ Object.keys(res).forEach(iterateDateRange);
+ result.sort(dateSort);
+ tracker.resolve(result);
+
+ function dateSort(lhs, rhs) {
+ return lhs.vhcl_nextdue.localeCompare(rhs.vhcl_nextdue);
+ }
+
+ function iterateDateRange(dr) {
+ if (dr.match(/_id|_rev/g))
+ return;
+ Object.keys(res[dr]).forEach(iterateService);
+
+ function iterateService(sId) {
+ if (res[dr][sId].vhcl_nextdue && ((dateRange == 'All') || ((moment(res[dr][sId].vhcl_nextdue).format(dateFormat).localeCompare(startdate) >= 0) && (moment(res[dr][sId].vhcl_nextdue).format(dateFormat).localeCompare(enddate) <= 0)))) {
+ var cfound = $filter('filter')(result, {
+ cstmr_id: res[dr][sId].cstmr_id
+ }, true);
+
+ if (cfound.length == 0)
+ result.push(res[dr][sId]);
+ }
+ }
+ }
+ }
+
+ function failure(err) {
+ tracker.reject(err);
+ }
+ }
+
+ function getFilterMonths() {
+ var tracker = $q.defer();
+ pdbCache.get(constants.pdb_cache_views.view_services).then(generateMonthsUsed).catch(failure);
+ return tracker.promise;
+
+ function generateMonthsUsed(res) {
+ var result = [];
+ Object.keys(res).forEach(iterateDateRange);
+ tracker.resolve(result);
+
+ function iterateDateRange(dr) {
+ if (dr.match(/_id|_rev/g))
+ return;
+ var temp = dr.split('-');
+ result.push({
+ month: utils.convertToTitleCase(temp[0]),
+ year: temp[1]
+ });
+ }
+ }
+
+ function failure(err) {
+ tracker.reject(err);
+ }
+ }
- function getTotalCustomerServed() {
+ function getTotalCustomerServed(dateRange) {
var tracker = $q.defer();
pdbCache.get(constants.pdb_cache_views.view_services).then(generateChartValues).catch(failure);
return tracker.promise;
function generateChartValues(res) {
- var result = [];
- var cd = moment().format('MMM YYYY');
- cd = angular.lowercase(cd).replace(' ', '-');
- if (res && res[cd]) {
- Object.keys(res[cd]).forEach(iterateService);
- }
+ var result = [], cd;
+ dateRange.forEach(iterateDateRange);
tracker.resolve(result);
+
+ function iterateDateRange(dr) {
+ cd = moment(dr.month + ' ' + dr.year, 'MMM YYYY').format('MMM YYYY');
+ cd = angular.lowercase(cd).replace(' ', '-');
+ if (res && res[cd]) {
+ Object.keys(res[cd]).forEach(iterateService);
+ }
+ }
function iterateService(sId) {
var target = res[cd][sId];
@@ -50,7 +177,7 @@
}
}
- function getProblemsAndVehicleTypes() {
+ function getProblemsAndVehicleTypes(dateRange) {
var problems = {}, vehicleTypes = {};
var tracker = $q.defer();
pdbCustomers.getAll().then(success).catch(failure);
@@ -69,17 +196,25 @@
function iterateVehicles(vId) {
var vt = row.doc.user.vehicles[vId].type;
- if (vt) {
- if (!vehicleTypes[vt])
- vehicleTypes[vt] = 0;
- vehicleTypes[vt]++;
- }
+ var vtc = 0;
+ if (vt)
+ vtc = (vehicleTypes[vt] != undefined) ? vehicleTypes[vt] : 0;
if (row.doc.user.vehicles[vId].services)
Object.keys(row.doc.user.vehicles[vId].services).forEach(iterateService);
function iterateService(sId) {
if (row.doc.user.vehicles[vId].services[sId]._deleted == true)
return;
+ var csd = moment(row.doc.user.vehicles[vId].services[sId].date).format('MMM YYYY').split(' ');
+ var sdfound = $filter('filter')(dateRange, {
+ month: csd[0],
+ year: csd[1]
+ }, true);
+
+ if (sdfound.length > 0)
+ vehicleTypes[vt] = vtc + 1;
+ else
+ return;
if (row.doc.user.vehicles[vId].services[sId].problems)
Object.keys(row.doc.user.vehicles[vId].services[sId].problems).forEach(iterateProblems);
@@ -98,29 +233,37 @@
}
}
- function getNewCustomers() {
+ function getNewCustomers(dateRange) {
var tracker = $q.defer();
pdbCache.get(constants.pdb_cache_views.view_services).then(getDoc).catch(failure);
return tracker.promise;
function getDoc(res) {
- var result = [], ub = [], unbilled = [];
- var cd = moment().format('MMM YYYY');
- cd = angular.lowercase(cd).replace(' ', '-');
- if (res[cd])
- Object.keys(res[cd]).forEach(iservice);
- unbilled.forEach(iterateUnbilled);
- delete unbilled;
- if (res)
- Object.keys(res).forEach(iterateDateRange);
+ var result = [], ub = [], unbilled = [], cd;
+ dateRange.forEach(iterateDateSetRange);
tracker.resolve({
unbilledServices: ub,
newCustomers: result
});
+
+ function iterateDateSetRange(drange) {
+ cd = moment(drange.month + ' ' + drange.year, 'MMM YYYY').format('MMM YYYY');
+ cd = angular.lowercase(cd).replace(' ', '-');
+ if (res[cd])
+ Object.keys(res[cd]).forEach(iservice);
+ unbilled.forEach(iterateUnbilled);
+ if (res)
+ Object.keys(res).forEach(iterateDateRange);
+ }
function iterateUnbilled(s) {
- if (s.srvc_status != 'Paid')
- ub.push(s);
+ if (s.srvc_status != 'Paid') {
+ var found = $filter('filter')(ub, {
+ srvc_id: s.srvc_id
+ }, true);
+ if (found.length == 0)
+ ub.push(s);
+ }
}
function iservice(s) {
@@ -131,7 +274,7 @@
var found = $filter('filter')(result, {
cstmr_id: target.cstmr_id
}, true);
-
+
if (found == 0)
result.push(target);
}
@@ -139,6 +282,16 @@
function iterateDateRange(dr) {
if (dr.match(/_id|_rev/g))
return;
+ var temp = dr.split('-');
+ var td = utils.convertToTitleCase(temp[0]) + ' ' + temp[1];
+ var f = $filter('filter')(dateRange, {
+ month: moment(td, 'MMM YYYY').format('MMM'),
+ year: moment(td, 'MMM YYYY').format('YYYY')
+ }, true);
+
+ if (f.length == 1)
+ return;
+
if (res[dr])
Object.keys(res[dr]).forEach(iterateService);
diff --git a/src/app/components/dashboard/dashboard.html b/src/app/components/dashboard/dashboard.html
index 4890f838..f065e149 100644
--- a/src/app/components/dashboard/dashboard.html
+++ b/src/app/components/dashboard/dashboard.html
@@ -11,7 +11,11 @@
.am-card-label {
font-weight: 500;
font-size: medium;
- color: rgba(30, 30, 30, 0.7);
+ color: #616161;
+ }
+
+ .am-card-label.white {
+ color: #fff;
}
.am-chart-no-border div {
@@ -55,15 +59,36 @@
outline: none;
cursor: pointer;
}
+
+ .am-dashboard-table-nxtdue {
+ width: 100%;
+ padding: 4px 4px 0 10px;
+ }
+
+ .am-dashboard-table-nxtdue td {
+ padding: 4px 0;
+ cursor: default;
+ color: #424242;
+ transition: color 400ms ease;
+ }
+
+ .am-dashboard-table-nxtdue tr:hover td {
+ color: #212121;
+ }
-
+
+
+ Showing data for : {{vm.ddTimeSet}}
+
+ date_range
+
+
Customers Served
- (This Month)
{{vm.totalCustomersServed}}
@@ -74,7 +99,6 @@
Income
- (This Month)
Rs.$$$Rs.{{vm.totalRevenueEarned}}
@@ -85,7 +109,6 @@
Due Payments
- (This Month)
Rs.{{vm.totalPendingPayments}}
@@ -96,7 +119,6 @@
New Customers
- (This Month)
{{vm.totalNewCustomers}}
@@ -105,19 +127,20 @@
-
+
- Daily Services (This Month: {{vm.totalServicesDone}} Services)
+ Daily Services ({{vm.totalServicesDone}} Services)
+
list
View All Services
-
+
add
Add Service
No Services Added For This Month
@@ -126,14 +149,55 @@
-
- Top Treatments (Overall)
+
+ Top Treatments
-
- Top Vehicle Types (Overall)
+
+
+ Service Reminders
+
+ {{vm.nsdcTime}}
+
+
+ date_range
+ Change Duration
+
+
+
+
+ {{tr}}
+
+
+
+
+
+
+
+
+ | {{vm.getNxtDueField(customer.cstmr_name)}}{{customer.cstmr_name}} |
+ {{vm.getNxtDueField(customer.cstmr_mobile)}}{{customer.cstmr_mobile}} |
+ {{vm.getNextDueVehicle(customer.vhcl_manuf,customer.vhcl_model,customer.vhcl_reg)}}{{vm.getNextDueVehicle(customer.vhcl_manuf,customer.vhcl_model,customer.vhcl_reg, true)}} |
+
+
+
+
+ No Reminders {{vm.nsdcTime}}
+
+
+
+
+ More
+ more_horiz
+
+
+
+
+
+
+ Top Vehicle Types
diff --git a/src/app/components/dashboard/tmpl/dialog_nextdueservices.tmpl.html b/src/app/components/dashboard/tmpl/dialog_nextdueservices.tmpl.html
new file mode 100644
index 00000000..9b97c43a
--- /dev/null
+++ b/src/app/components/dashboard/tmpl/dialog_nextdueservices.tmpl.html
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+
+
+
+
+
+ |
+ |
+ |
+ |
+
+
+
+
+ | {{customer.cstmr_name}} |
+ {{customer.cstmr_mobile}} |
+ {{customer.vhcl_manuf + ' ' + customer.vhcl_model}} ({{customer.vhcl_reg}}) |
+
+
+ {{vm.getDate(customer.vhcl_nextdue)}}
+ |
+
+
+ delete
+ Delete Reminder
+
+ |
+
+
+
+
+
+
+
+
+
+ |
+
+ arrow_back
+
+ |
+
+
+ {{vm.yearRange[vm.currentYearIndex]}}
+
+ |
+
+
+ arrow_forward
+
+ |
+
+
+
+
+ |
+
+ Jan
+
+ |
+
+
+ Feb
+
+ |
+
+
+ Mar
+
+ |
+
+
+ |
+
+ Apr
+
+ |
+
+
+ May
+
+ |
+
+
+ Jun
+
+ |
+
+
+ |
+
+ Jul
+
+ |
+
+
+ Aug
+
+ |
+
+
+ Sept
+
+ |
+
+
+ |
+
+ Oct
+
+ |
+
+
+ Nov
+
+ |
+
+
+ Dec
+
+ |
+
+
+
+
+
+
+ done
+ Done
+
+
+
\ No newline at end of file
diff --git a/src/app/components/invoices/invoices-view.controller.js b/src/app/components/invoices/invoices-view.controller.js
index 5dba8a94..7002b8c9 100644
--- a/src/app/components/invoices/invoices-view.controller.js
+++ b/src/app/components/invoices/invoices-view.controller.js
@@ -2,7 +2,7 @@
* Controller for View Invoice component
* @author ndkcha
* @since 0.5.0
- * @version 0.6.1
+ * @version 0.6.4
*/
///
@@ -14,17 +14,23 @@
const eIpc = require("electron").ipcRenderer;
// angular code
- angular.module('automintApp').controller('amCtrlIvRI', InvoicesViewController);
+ angular.module('automintApp')
+ .controller('amCtrlIvRI', InvoicesViewController)
+ .controller('amCtrlCmI', ConfirmMailController);
- InvoicesViewController.$inject = ['$q', '$log', '$state', '$window', 'utils', 'amInvoices'];
+ InvoicesViewController.$inject = ['$q', '$log', '$state', '$window', '$mdDialog', 'utils', 'amInvoices'];
+ ConfirmMailController.$inject = ['$mdDialog', 'utils', 'user'];
- function InvoicesViewController($q, $log, $state, $window, utils, amInvoices) {
+ function InvoicesViewController($q, $log, $state, $window, $mdDialog, utils, amInvoices) {
// initialize view model
var vm = this;
+ var oCustomerEmail;
+
// named assignments to keep track of UI elements
vm.isFabOpen = true;
vm.fabClass = '';
+ vm.subtotal = 0;
// function maps
vm.printInvoice = printInvoice;
@@ -41,6 +47,10 @@
vm.IsSocialFacebook = IsSocialFacebook;
vm.IsSocialInstagram = IsSocialInstagram;
vm.IsSocialTwitter = IsSocialTwitter;
+ vm.initiateMailInvoiceProcess = initiateMailInvoiceProcess;
+ vm.IsInvoiceAvailable = IsInvoiceAvailable;
+ vm.IsSubtotalEnabled = IsSubtotalEnabled;
+ vm.calculateSubtotal = calculateSubtotal;
// default execution steps
if ($state.params.userId == undefined || $state.params.vehicleId == undefined || $state.params.serviceId == undefined) {
@@ -57,6 +67,41 @@
// function definitions
+ function IsSubtotalEnabled() {
+ return (vm.isDiscountApplied || vm.isRoundOff || (vm.sTaxSettings && vm.sTaxSettings.applyTax) || (vm.vatSettings && vm.vatSettings.applyTax));
+ }
+
+ function calculateSubtotal() {
+ var totalCost = 0;
+ vm.service.problems.forEach(iterateProblem);
+ vm.service.inventories.forEach(iterateInventories);
+ if (vm.service.packages) {
+ vm.service.packages.forEach(iteratePackages);
+ }
+ totalCost = (totalCost % 1 != 0) ? totalCost.toFixed(2) : parseInt(totalCost);
+ vm.subtotal = totalCost;
+
+ function iterateProblem(element) {
+ totalCost += parseFloat(element.rate);
+ }
+
+ function iterateInventories(element) {
+ totalCost += parseFloat(element.rate * element.qty);
+ }
+
+ function iteratePackages(package) {
+ package.treatments.forEach(ipt);
+ }
+
+ function ipt(treatment) {
+ totalCost += treatment.rate;
+ }
+ }
+
+ function IsInvoiceAvailable() {
+ return (vm.service && vm.service.state == "Bill");
+ }
+
function IsSocialFacebook() {
if (vm.workshop.social.facebook == undefined)
return false;
@@ -83,7 +128,7 @@
}
function failure(err) {
- console.log('Cound not find margin settings');
+ console.info('Cound not find margin settings');
}
}
@@ -154,6 +199,7 @@
function fillServiceDetails(res) {
vm.user = res.user;
+ oCustomerEmail = res.user.email;
vm.vehicle = res.vehicle;
vm.service = res.service;
vm.isRoundOff = (vm.service.roundoff != undefined);
@@ -169,6 +215,7 @@
tax: res.service.vat.tax
}
calculateInventoryValues();
+ calculateSubtotal();
}
function failure(err) {
@@ -234,7 +281,7 @@
}
function failure(err) {
- console.log(err);
+ console.warn(err);
$log.info('Could not load display settings!');
}
}
@@ -286,6 +333,36 @@
}
}
+ function initiateMailInvoiceProcess(ev) {
+ $mdDialog.show({
+ controller: 'amCtrlCmI',
+ controllerAs: 'vm',
+ templateUrl: 'app/components/invoices/invoices_confirmmail.tmpl.html',
+ parent: angular.element(document.body),
+ targetEvent: event,
+ locals: {
+ utils: utils,
+ user: vm.user
+ },
+ clickOutsideToClose: true
+ }).then(doMailInvoice).catch(cancelMailInvoice);
+
+ function doMailInvoice(result) {
+ vm.user.email = result;
+ mailInvoice();
+ if (vm.user.email != oCustomerEmail)
+ amInvoices.saveCustomerEmail($state.params.userId, vm.user.email).then(respond).catch(respond);
+
+ function respond(res) {
+ console.info(res);
+ }
+ }
+
+ function cancelMailInvoice() {
+ console.info('cancelled');
+ }
+ }
+
// send email
function mailInvoice() {
if (vm.user.email == undefined || vm.user.email == '') {
@@ -381,4 +458,24 @@
}
}
}
+
+ function ConfirmMailController($mdDialog, utils, user) {
+ var vm = this;
+
+ vm.user = user;
+ vm.sendInvoice = sendInvoice;
+ vm.cancelInvoice = cancelInvoice;
+
+ function sendInvoice() {
+ if (vm.user.email == '' || vm.user.email == undefined) {
+ utils.showSimpleToast('Please Enter Email Address');
+ return;
+ }
+ $mdDialog.hide(vm.user.email);
+ }
+
+ function cancelInvoice() {
+ $mdDialog.cancel();
+ }
+ }
})();
\ No newline at end of file
diff --git a/src/app/components/invoices/invoices.factory.js b/src/app/components/invoices/invoices.factory.js
index 5b4b8d6b..1f92fb9c 100644
--- a/src/app/components/invoices/invoices.factory.js
+++ b/src/app/components/invoices/invoices.factory.js
@@ -2,7 +2,7 @@
* Factory that handles database interactions between invoices database and controller
* @author ndkcha
* @since 0.5.0
- * @version 0.6.1
+ * @version 0.6.4
*/
///
@@ -19,13 +19,33 @@
getServiceDetails: getServiceDetails,
getWorkshopDetails: getWorkshopDetails,
getIvSettings: getIvSettings,
- getIvAlignMargins: getIvAlignMargins
+ getIvAlignMargins: getIvAlignMargins,
+ saveCustomerEmail: saveCustomerEmail
}
return factory;
// function definitions
+ function saveCustomerEmail(userId, email) {
+ var tracker = $q.defer();
+ pdbCustomers.get(userId).then(getUserObject).catch(failure);
+ return tracker.promise;
+
+ function getUserObject(res) {
+ res.user.email = email;
+ pdbCustomers.save(res).then(success).catch(failure);
+ }
+
+ function success(res) {
+ tracker.resolve(res);
+ }
+
+ function failure(err) {
+ tracker.reject(err);
+ }
+ }
+
function getIvAlignMargins() {
var tracker = $q.defer();
$amRoot.isSettingsId().then(getSettingsDoc).catch(failure);
diff --git a/src/app/components/invoices/invoices_confirmmail.tmpl.html b/src/app/components/invoices/invoices_confirmmail.tmpl.html
new file mode 100644
index 00000000..99f4699c
--- /dev/null
+++ b/src/app/components/invoices/invoices_confirmmail.tmpl.html
@@ -0,0 +1,32 @@
+
+
+
+ Confirm Email Address
+ Please enter {{vm.user.name}}'s email address
+
+
+
+
+ Cancel
+
+
+ Send
+ send
+
+
+
\ No newline at end of file
diff --git a/src/app/components/invoices/invoices_view.html b/src/app/components/invoices/invoices_view.html
index 44bff2d5..25e1b5b0 100644
--- a/src/app/components/invoices/invoices_view.html
+++ b/src/app/components/invoices/invoices_view.html
@@ -16,7 +16,7 @@
Back
-
+
email
Email
@@ -167,7 +167,7 @@ {{vm.workshop.name}}
|
|
- Invoice #{{vm.service.invoiceno}}
+ Invoice #{{vm.service.invoiceno}}
{{vm.service.date}}
|
@@ -213,31 +213,37 @@ {{vm.workshop.name}}
{{inventory.qty}} |
Rs. {{inventory.total}} |
-
+
+ | Sub Total |
+ |
+ |
+ Rs. {{vm.subtotal}} |
+
+
| Service Tax ({{vm.sTaxSettings.tax}}%) |
|
|
Rs. {{vm.calculateServiceTax()}} |
-
+
| VAT ({{vm.vatSettings.tax}}%) |
|
|
Rs. {{vm.calculateVat()}} |
-
+
| Discount ({{vm.service.discount.percent}}%) |
|
|
Rs. {{vm.service.discount.amount}} |
-
+
| Round Off |
|
|
Rs. {{vm.service.roundoff}} |
-
+
| Total |
|
|
diff --git a/src/app/components/services/services-add.controller.js b/src/app/components/services/services-add.controller.js
index 86956b79..63cf2686 100644
--- a/src/app/components/services/services-add.controller.js
+++ b/src/app/components/services/services-add.controller.js
@@ -2,7 +2,7 @@
* Controller for Add Service module
* @author ndkcha
* @since 0.4.1
- * @version 0.6.1
+ * @version 0.6.4
*/
///
@@ -12,7 +12,7 @@
.controller('amCtrlSeCI', ServiceAddController)
.controller('amCtrlMeD', MembershipEditDialogController);
- ServiceAddController.$inject = ['$state', '$q', '$log', '$filter', '$mdEditDialog', '$mdDialog', 'utils', 'amServices'];
+ ServiceAddController.$inject = ['$scope', '$state', '$q', '$log', '$filter', '$timeout', '$mdEditDialog', '$mdDialog', '$mdSidenav', 'utils', 'amServices'];
MembershipEditDialogController.$inject = ['$mdDialog', '$filter', 'membership', 'treatments'];
/*
@@ -20,7 +20,7 @@
> Do not create new method named moment() since it is used by moment.js
*/
- function ServiceAddController($state, $q, $log, $filter, $mdEditDialog, $mdDialog, utils, amServices) {
+ function ServiceAddController($scope, $state, $q, $log, $filter, $timeout, $mdEditDialog, $mdDialog, $mdSidenav, utils, amServices) {
// initialize view model
var vm = this;
@@ -28,20 +28,15 @@
var autofillVehicle = false,
flagGetUserBasedOnMobile = true,
olInvoiceNo = 1,
+ olJobCardNo = 1,
+ olEstimateNo = 1,
transitIds = undefined,
transitInterState = undefined,
- isDiscountByPercent = true,
- isManualRoundOff = false,
- serviceTotalCost = 0,
- forceStopCalCost = false;
+ forceStopCalCost = false,
+ serviceTcRo = 0,
+ serviceTcDc = 0;
// vm assignments to keep track of UI related elements
- vm.label_userMobile = 'Enter Mobile Number:';
- vm.label_userEmail = 'Enter Email:';
- vm.label_userAddress = 'Enter Address:';
- vm.label_vehicleReg = 'Enter Vehicle Reg Number:';
- vm.label_vehicleManuf = 'Manufacturer:';
- vm.label_vehicleModel = 'Model:';
vm.vehicleTypeList = [];
vm.user = {
id: '',
@@ -62,7 +57,10 @@
odo: 0,
cost: 0,
status: '',
+ state: '',
invoiceno: 1,
+ jobcardno: 1,
+ estimateno: 1,
problems: []
};
vm.problem = {
@@ -95,6 +93,15 @@
total: ''
};
vm.totalCost = 0;
+ vm.isUserInfoExpanded = true;
+ vm.isVehicleInfoExpanded = false;
+ vm.isServiceInfoExpanded = false;
+ vm.serviceStateList = ['Job Card', 'Estimate', 'Bill'];
+ vm.service.state = vm.serviceStateList[2];
+ vm.label_invoice = 'Invoice';
+ vm.isNextDueService = false;
+ vm.nextDueDate = new Date();
+ vm.nextDueDate.setMonth(vm.nextDueDate.getMonth() + 3);
// named assignments to handle behaviour of UI elements
vm.redirect = {
@@ -107,11 +114,6 @@
vm.searchVehicleChange = searchVehicleChange;
vm.manufacturersQuerySearch = manufacturersQuerySearch;
vm.modelQuerySearch = modelQuerySearch;
- vm.changeUserMobileLabel = changeUserMobileLabel;
- vm.changeUserEmailLabel = changeUserEmailLabel;
- vm.changeVehicleRegLabel = changeVehicleRegLabel;
- vm.changeVehicleTab = changeVehicleTab;
- vm.changeUserTab = changeUserTab;
vm.changeVehicle = changeVehicle;
vm.isAddOperation = isAddOperation;
vm.chooseVehicle = chooseVehicle;
@@ -123,16 +125,14 @@
vm.treatmentsQuerySearch = treatmentsQuerySearch;
vm.onProblemSelected = onProblemSelected;
vm.onProblemDeselected = onProblemDeselected;
- vm.changeServiceTab = changeServiceTab;
vm.updateTreatmentDetails = updateTreatmentDetails;
vm.finalizeNewProblem = finalizeNewProblem;
vm.save = save;
- vm.changeUserAddressLabel = changeUserAddressLabel;
vm.queryMembershipChip = queryMembershipChip;
vm.OnClickMembershipChip = OnClickMembershipChip;
vm.calculateCost = calculateCost;
vm.OnAddMembershipChip = OnAddMembershipChip;
- vm.navigateToSubscriptMembership = navigateToSubscriptMembership;
+ vm.navigateToSubscribeMembership = navigateToSubscribeMembership;
vm.goBack = goBack;
vm.changeProblemRate = changeProblemRate;
vm.changeServiceTax = changeServiceTax;
@@ -150,12 +150,54 @@
vm.calculateVat = calculateVat;
vm.changeQty = changeQty;
vm.changeInventoryTotal = changeInventoryTotal;
- vm.populateRoundOffVal = populateRoundOffVal;
+ vm.populateRoD = populateRoD;
vm.changeForceStopCalCost = changeForceStopCalCost;
- vm.calculateViewportHeight = calculateViewportHeight;
+ vm.unsubscribeMembership = unsubscribeMembership;
+ vm.label_titleCustomerMoreInfo = label_titleCustomerMoreInfo;
+ vm.changeUserInfoState = changeUserInfoState;
+ vm.changeVehicleInfoState = changeVehicleInfoState;
+ vm.changeServiceInfoState = changeServiceInfoState;
+ vm.openCustomerMoreDetails = buildDelayedToggler('customer-more-right');
+ vm.closeCustomerMoreDetails = closeCustomerMoreDetails;
+ vm.openServiceDetailsPanel = buildDelayedToggler('service-details-left');
+ vm.fetchFocusItemAfterSS = fetchFocusItemAfterSS;
+ vm.lockServiceNavbar = lockServiceNavbar;
+ vm.IsMembershipTreatmentsDisabled = IsMembershipTreatmentsDisabled;
+ vm.IsNoMembershipSubscribed = IsNoMembershipSubscribed;
+ vm.IsMembershipEnabled = IsMembershipEnabled;
+ vm.IsPackageEnabled = IsPackageEnabled;
+ vm.convertVehicleTypeToAF = convertVehicleTypeToAF;
+ vm.IsTreatmentAmountEditable = IsTreatmentAmountEditable;
+ vm.IsTreatmentAmountText = IsTreatmentAmountText;
+ vm.IsPackageEnabled = IsPackageEnabled;
+ vm.changeDisplayAsList = changeDisplayAsList;
+ vm.IsTreatmentRateDisplayed = IsTreatmentRateDisplayed;
+ vm.changeInventoryAsList = changeInventoryAsList;
+ vm.IsInventoryTotalEditable = IsInventoryTotalEditable;
+ vm.IsInventoryTotalText = IsInventoryTotalText;
+ vm.IsServiceStateSelected = IsServiceStateSelected;
+ vm.selectServiceState = selectServiceState;
+ vm.WhichServiceStateEnabled = WhichServiceStateEnabled;
+ vm.autoCapitalizeCustomerAddress = autoCapitalizeCustomerAddress;
+ vm.autoCapitalizeVehicleModel = autoCapitalizeVehicleModel;
+ vm.calculateSubtotal = calculateSubtotal;
+ vm.doRoundOff = doRoundOff;
+ vm.calculateRoundOff = calculateRoundOff;
+ vm.calculateDiscount = calculateDiscount;
+ vm.isRoD = isRoD;
+ vm.IsSubtotalEnabled = IsSubtotalEnabled;
+ vm.IsServiceStateJc = IsServiceStateJc;
+ vm.IsServiceStateEs = IsServiceStateEs;
+ vm.IsServiceStateIv = IsServiceStateIv;
+ vm.getDate = getDate;
// default execution steps
- // vm.serviceTab = true; // testing purposes [amTODO: remove it]
+ setCoverPic();
+ changeUserInfoState(true); // ammToDo: Enable this while commiting
+ setTimeout(focusUserName, 700);
+ // changeServiceInfoState(true); // ammToDo: Testing Purpose, Disable while commiting
+ buildDelayedToggler('service-details-left');
+ getDefaultServiceType();
getTreatmentDisplayFormat();
getInventoriesSettings();
getVehicleTypes();
@@ -163,13 +205,307 @@
getInventories();
getMemberships();
getLastInvoiceNo();
+ getLastEstimateNo();
+ getLastJobCardNo();
- vm.serviceViewportHeight = $(window).height();
+ // watchers
+ $(window).on('resize', OnWindowResize);
// function definitions
- function calculateViewportHeight(element) {
- vm.serviceViewportHeight = $(window).height() - (2*element[0].offsetTop + 0.6*element[0].offsetTop);
+ function getDate(date) {
+ return moment(date).format('DD MMM YYYY');
+ }
+
+ function IsServiceStateIv(state) {
+ if (!IsServiceStateSelected(state))
+ return false;
+ return (vm.service.state == vm.serviceStateList[2]);
+ }
+
+ function IsServiceStateEs(state) {
+ if (!IsServiceStateSelected(state))
+ return false;
+ return (vm.service.state == vm.serviceStateList[1]);
+ }
+
+ function IsServiceStateJc(state) {
+ if (!IsServiceStateSelected(state))
+ return false;
+ return (vm.service.state == vm.serviceStateList[0]);
+ }
+
+ function OnWindowResize() {
+ if (vm.isServiceInfoExpanded)
+ setServicesVpHeight();
+ }
+
+ function setServicesVpHeight() {
+ $('#am-service-viewport').height($(window).height() - ($('#am-service-viewport').offset().top + 15));
+ }
+
+ function IsSubtotalEnabled() {
+ return (vm.isDiscountApplied || vm.isRoundOffVal || (vm.sTaxSettings && vm.sTaxSettings.applyTax) || (vm.vatSettings && vm.vatSettings.applyTax));
+ }
+
+ function isRoD() {
+ return (vm.isDiscountApplied || vm.isRoundOffVal);
+ }
+
+ function doRoundOff(input) {
+ if (input == '')
+ return 0;
+ return ((input % 1 != 0) ? input.toFixed(2) : parseInt(input));
+ }
+
+ function calculateSubtotal() {
+ var totalCost = 0;
+ vm.service.problems.forEach(iterateProblem);
+ vm.selectedInventories.forEach(iterateInventories);
+ if (vm.serviceType == vm.serviceTypeList[1]) {
+ vm.packages.forEach(iteratePackages);
+ }
+ totalCost = (totalCost % 1 != 0) ? totalCost.toFixed(2) : parseInt(totalCost);
+ return totalCost;
+
+ function iterateProblem(element) {
+ totalCost += parseFloat(element.rate ? (element.rate * (element.checked ? 1 : 0)) : 0);
+ }
+
+ function iterateInventories(element) {
+ totalCost += parseFloat(element.rate ? ((element.rate * element.qty) * (element.checked ? 1 : 0)) : 0);
+ }
+
+ function iteratePackages(package) {
+ if (!package.checked)
+ return;
+ package.selectedTreatments.forEach(ipt);
+ }
+
+ function ipt(treatment) {
+ totalCost += treatment.rate[vm.vehicle.type.toLowerCase().replace(' ', '-')];
+ }
+ }
+
+ function getDefaultServiceType() {
+ amServices.getDefaultServiceType().then(success).catch(failure);
+
+ function success(res) {
+ vm.service.state = res;
+ vm.label_invoice = (vm.service.state == vm.serviceStateList[2]) ? 'Invoice' : 'Send';
+ }
+
+ function failure(err) {
+ vm.service.state = vm.serviceStateList[2];
+ vm.label_invoice = (vm.service.state == vm.serviceStateList[2]) ? 'Invoice' : 'Send';
+ }
+ }
+
+ function autoCapitalizeVehicleModel() {
+ vm.vehicle.model = utils.autoCapitalizeWord(vm.vehicle.model);
+ }
+
+ function autoCapitalizeVehicleManuf() {
+ vm.vehicle.manuf = utils.autoCapitalizeWord(vm.vehicle.manuf);
+ }
+
+ function autoCapitalizeCustomerAddress() {
+ vm.user.address = utils.autoCapitalizeWord(vm.user.address);
+ }
+
+ function WhichServiceStateEnabled(index) {
+ return (IsServiceStateSelected(vm.serviceStateList[index]));
+ }
+
+ function selectServiceState(state) {
+ vm.service.state = state;
+ vm.label_invoice = (vm.service.state == vm.serviceStateList[2]) ? 'Invoice' : 'Send';
+ }
+
+ function IsServiceStateSelected(state) {
+ return (vm.service.state == state);
+ }
+
+ function focusShowAllInventoriesButton() {
+ $('#ami-display-inventory-as').focus();
+ }
+
+ function focusShowAllTreatmentsButton() {
+ $('#ami-display-as').focus();
+ }
+
+ function IsInventoryTotalText() {
+ return (vm.vatSettings && !vm.vatSettings.inclusive && vm.vatSettings.applyTax);
+ }
+
+ function IsInventoryTotalEditable() {
+ return (vm.vatSettings && (vm.vatSettings.inclusive || !vm.vatSettings.applyTax));
+ }
+
+ function changeInventoryAsList(bool) {
+ vm.displayInventoriesAsList = bool;
+ setTimeout(focusShowAllInventoriesButton, 300);
+ }
+
+ function IsTreatmentRateDisplayed() {
+ return (vm.sTaxSettings && vm.sTaxSettings.applyTax && !vm.sTaxSettings.inclusive);
+ }
+
+ function changeDisplayAsList(bool) {
+ vm.displayTreatmentAsList = bool;
+ setTimeout(focusShowAllTreatmentsButton, 300);
+ }
+
+ function IsPackageEnabled() {
+ return (vm.packages.length < 1);
+ }
+
+ function IsTreatmentAmountText() {
+ return (vm.sTaxSettings && !vm.sTaxSettings.inclusive && vm.sTaxSettings.applyTax);
+ }
+
+ function IsTreatmentAmountEditable() {
+ return (vm.sTaxSettings && (vm.sTaxSettings.inclusive || !vm.sTaxSettings.applyTax));
+ }
+
+ function convertVehicleTypeToAF() {
+ return (vm.vehicle.type.toLowerCase().replace(' ', '-'));
+ }
+
+ function IsPackageEnabled() {
+ return (vm.serviceType == vm.serviceTypeList[1]);
+ }
+
+ function IsMembershipEnabled() {
+ return (vm.serviceType == vm.serviceTypeList[2]);
+ }
+
+ function IsNoMembershipSubscribed() {
+ return (vm.membershipChips.length < 1);
+ }
+
+ function IsMembershipTreatmentsDisabled(membership, treatment) {
+ return (membership.calculateTOccurenceLeft(treatment) <= 0 || membership.calculateTDurationLeft(treatment) <= 0);
+ }
+
+ function lockServiceNavbar() {
+ return $mdMedia('gt-md');
+ }
+
+ function fetchFocusItemAfterSS() {
+ changeServiceInfoState(true, null, true);
+ }
+
+ function setCoverPic() {
+ var source = localStorage.getItem('cover-pic');
+ $('#am-sp-cover-pic').attr('src', (source) ? source : 'assets/img/logo-250x125px.png').width(250).height(125);
+ }
+
+ function label_titleCustomerMoreInfo() {
+ return (vm.user.name ? vm.user.name + "'s" : "Customer");
+ }
+
+ function closeCustomerMoreDetails() {
+ $mdSidenav('customer-more-right').close();
+ setTimeout(cvis, 800);
+
+ function cvis() {
+ changeVehicleInfoState(true);
+ }
+ }
+
+ // Supplies a function that will continue to operate until the time is up.
+ function debounce(func, wait, context) {
+ var timer;
+ return function debounced() {
+ var context = $scope,
+ args = Array.prototype.slice.call(arguments);
+ $timeout.cancel(timer);
+ timer = $timeout(function() {
+ timer = undefined;
+ func.apply(context, args);
+ }, wait || 10);
+ };
+ }
+
+ // Build handler to open/close a SideNav; when animation finishes report completion in console
+ function buildDelayedToggler(navID) {
+ return debounce(function() {
+ $mdSidenav(navID).toggle();
+ }, 200);
+ }
+
+ function focusServiceState() {
+ $('#ami-service-state').focus();
+ }
+
+ function focusInvoiceNo() {
+ $('#ami-service-invoice-no').focus();
+ }
+
+ function focusUserName() {
+ $('#ami-user-name input').focus();
+ }
+
+ function focusVehicleManuf() {
+ $('#ami-vehicle-manuf input').focus();
+ }
+
+ function changeUserInfoState(expanded) {
+ vm.isUserInfoExpanded = expanded;
+ if (expanded)
+ setTimeout(focusUserName, 300);
+ vm.isVehicleInfoExpanded = true;
+ vm.isServiceInfoExpanded = false;
+ }
+
+ function changeVehicleInfoState(expanded, event) {
+ if (event != undefined) {
+ if (event.keyCode != 9)
+ return;
+ }
+ vm.isVehicleInfoExpanded = expanded;
+ if (expanded)
+ setTimeout(focusVehicleManuf, 300);
+ vm.isUserInfoExpanded = true;
+ vm.isServiceInfoExpanded = false;
+ }
+
+ function changeServiceInfoState(expanded, event, isAlreadyThere) {
+ if (event != undefined) {
+ if (event.keyCode != 9)
+ return;
+ }
+ if (expanded) {
+ if (!isAlreadyThere)
+ setTimeout(focusInvoiceNo, 300);
+ else
+ setTimeout(focusServiceState, 300);
+ }
+ vm.isServiceInfoExpanded = expanded;
+ if (expanded)
+ setTimeout(setServicesVpHeight, 500);
+ vm.isUserInfoExpanded = false;
+ vm.isVehicleInfoExpanded = false;
+ }
+
+ function unsubscribeMembership(ev, chip) {
+ var confirm = $mdDialog.confirm()
+ .textContent('Unsubscribe to ' + chip.name + ' ?')
+ .ariaLabel('Unsubscribe to ' + chip.name)
+ .targetEvent(ev)
+ .ok('Yes')
+ .cancel('No');
+
+ $mdDialog.show(confirm).then(performDelete, ignoreDelete);
+
+ function performDelete() {
+ console.info('deleted');
+ }
+
+ function ignoreDelete() {
+ vm.membershipChips.push(chip);
+ }
}
function changeInventoryTotal(inventory) {
@@ -186,7 +522,7 @@
function iterateInventories(element) {
if ((vm.vatSettings && !vm.vatSettings.applyTax) || !element.tax || !element.checked)
return;
- totalTax += parseFloat(element.tax.toFixed(2) * element.qty);
+ totalTax += parseFloat(element.tax * element.qty);
}
}
@@ -364,8 +700,6 @@
inventory.rate = inventory.amount;
inventory.tax = (inventory.rate * vm.vatSettings.tax / 100);
inventory.amount = inventory.rate + inventory.tax;
- if (inventory.amount % 1 != 0)
- inventory.amount = parseFloat(inventory.amount).toFixed(2);
}
} else if (force) {
if (vm.vatSettings.inclusive)
@@ -410,7 +744,7 @@
if (!problem.rate)
problem.rate = problem.amount;
problem.tax = (problem.rate * vm.sTaxSettings.tax / 100);
- problem.amount = Math.round(problem.rate + problem.tax);
+ problem.amount = problem.rate + problem.tax;
}
} else if (force) {
if (vm.sTaxSettings.inclusive)
@@ -469,8 +803,9 @@
OnAddMembershipChip(chip);
}
- function navigateToSubscriptMembership() {
- vm.userTab = true;
+ function navigateToSubscribeMembership() {
+ changeUserInfoState(true);
+ vm.openCustomerMoreDetails();
}
function OnClickMembershipChip(event) {
@@ -558,11 +893,12 @@
}
function OnAddMembershipChip(chip) {
- if (vm.membershipChips.length > 0)
- vm.serviceType = vm.serviceTypeList[2];
+ vm.serviceType = (vm.membershipChips.length > 0) ? vm.serviceTypeList[2] : vm.serviceTypeList[0];
var m = $.extend({}, chip.treatments, false);
- chip.treatments = [];
- Object.keys(m).forEach(iterateTreatments);
+ if (!angular.isArray(chip.treatments)) {
+ chip.treatments = [];
+ Object.keys(m).forEach(iterateTreatments);
+ }
chip.selectedTreatments = [];
chip.startdate = moment().format();
chip.treatments.forEach(makeSelectedTreatments);
@@ -719,7 +1055,7 @@
treatment.tax[cvt] = (treatment.rate[cvt] * vm.sTaxSettings.tax / 100);
} else {
treatment.tax[cvt] = (treatment.rate[cvt] * vm.sTaxSettings.tax / 100);
- treatment.amount[cvt] = Math.round(treatment.rate[cvt] + treatment.tax[cvt]);
+ treatment.amount[cvt] = treatment.rate[cvt] + treatment.tax[cvt];
}
} else if (force) {
if (vm.sTaxSettings.inclusive)
@@ -753,6 +1089,34 @@
}
}
+ function getLastJobCardNo() {
+ amServices.getLastJobCardNo().then(success).catch(failure);
+
+ function success(res) {
+ vm.service.jobcardno = ++res;
+ olJobCardNo = res;
+ }
+
+ function failure(err) {
+ vm.service.jobcardno = 1;
+ olJobCardNo = 1;
+ }
+ }
+
+ function getLastEstimateNo() {
+ amServices.getLastEstimateNo().then(success).catch(failure);
+
+ function success(res) {
+ vm.service.estimateno = ++res;
+ olEstimateNo = res;
+ }
+
+ function failure(err) {
+ vm.service.estimateno = 1;
+ olEstimateNo = 1;
+ }
+ }
+
// get last invoice number from database
function getLastInvoiceNo() {
amServices.getLastInvoiceNo().then(success).catch(failure);
@@ -794,6 +1158,7 @@
}
function failure(err) {
+ console.log(err);
setDefaultVehicle();
}
}
@@ -845,13 +1210,9 @@
vm.user.name = res.name;
vm.user.address = (res.address == undefined) ? '' : res.address;
if (res.memberships) {
- if (Object.keys(res.memberships).length > 0)
- vm.serviceType = vm.serviceTypeList[2];
+ vm.serviceType = (Object.keys(res.memberships).length > 0) ? vm.serviceTypeList[2] : vm.serviceTypeList[0];
Object.keys(res.memberships).forEach(iterateMemberships);
}
- changeUserMobileLabel();
- changeUserEmailLabel();
- changeUserAddressLabel();
vm.possibleVehicleList = res.possibleVehicleList;
vm.changeUserMobile(false);
changeVehicle(vm.possibleVehicleList.length > 0 ? vm.possibleVehicleList[0].id : undefined);
@@ -870,9 +1231,6 @@
vm.user.email = '';
vm.user.address = '';
vm.membershipChips = [];
- changeUserMobileLabel();
- changeUserEmailLabel();
- changeUserAddressLabel();
vm.possibleVehicleList = [];
changeVehicle();
}
@@ -903,9 +1261,6 @@
vm.serviceType = vm.serviceTypeList[2];
Object.keys(res.memberships).forEach(iterateMemberships);
}
- changeUserMobileLabel();
- changeUserEmailLabel();
- changeUserAddressLabel();
vm.possibleVehicleList = res.possibleVehicleList;
changeVehicle(vm.possibleVehicleList.length > 0 ? vm.possibleVehicleList[0].id : undefined);
@@ -919,29 +1274,34 @@
function failure(err) {
vm.loadingBasedOnMobile = false;
vm.user.id = '';
- changeUserMobileLabel();
vm.possibleVehicleList = [];
changeVehicle();
}
}
// change vehicle related details when changed from UI
- function changeVehicle(id) {
+ function changeVehicle(id, manual) {
if (!id) {
setDefaultVehicle();
+ setTimeout(focusVehicleManuf, 500);
return;
}
var found = $filter('filter')(vm.possibleVehicleList, {
id: id
}, true);
if (found.length > 0) {
+ if (manual)
+ changeServiceInfoState(true);
vm.currentVehicle = found[0].name;
vm.vehicle.id = found[0].id;
vm.vehicle.reg = found[0].reg;
vm.vehicle.manuf = found[0].manuf;
vm.vehicle.model = found[0].model;
vm.vehicle.type = (found[0].type == undefined || found[0].type == '') ? vm.vehicleTypeList[0] : found[0].type;
- changeVehicleRegLabel();
+ if (found[0].nextdue && (found[0].nextdue.localeCompare(moment().format()) > 0)) {
+ vm.isNextDueService = true;
+ vm.nextDueDate = new Date(found[0].nextdue);
+ }
changeVehicleType();
autofillVehicle = true;
} else
@@ -959,7 +1319,9 @@
vm.vehicle.type = vm.vehicleTypeList[0];
changeVehicleType();
}
- changeVehicleRegLabel();
+ vm.isNextDueService = false;
+ vm.nextDueDate = new Date();
+ vm.nextDueDate.setMonth(vm.nextDueDate.getMonth() + 3);
autofillVehicle = false;
}
@@ -1045,6 +1407,7 @@
// vehicle manufacturer is updated from UI, clear model list to populate new list w.r.t. manufacturer
function searchVehicleChange() {
+ autoCapitalizeVehicleManuf();
if (!autofillVehicle) {
vm.models = [];
vm.vehicle.model = '';
@@ -1072,7 +1435,7 @@
} else {
problem.rate = (rate == '' || rate == undefined ? problem.rate : rate);
problem.tax = (problem.rate * vm.sTaxSettings.tax / 100);
- problem.amount = Math.round(problem.rate + problem.tax);
+ problem.amount = problem.rate + problem.tax;
}
} else {
problem.rate = (rate == '' || rate == undefined ? problem.rate : rate);
@@ -1088,43 +1451,6 @@
}
// return boolean response to different configurations [END]
- // change user tab selector variable
- function changeUserTab(bool) {
- vm.userTab = bool;
- }
-
- // change vehicle tab selector variable
- function changeVehicleTab(bool) {
- vm.vehicleTab = bool;
- }
-
- // change service tab selector variable
- function changeServiceTab(bool) {
- vm.serviceTab = bool;
- }
-
- // listen to changes in input fields [BEGIN]
- function changeUserMobileLabel(force) {
- vm.isUserMobile = (force != undefined || vm.user.mobile != '');
- vm.label_userMobile = vm.isUserMobile ? 'Mobile:' : 'Enter Mobile Number:';
- }
-
- function changeUserEmailLabel(force) {
- vm.isUserEmail = (force != undefined || vm.user.email != '');
- vm.label_userEmail = vm.isUserEmail ? 'Email:' : 'Enter Email:';
- }
-
- function changeUserAddressLabel(force) {
- vm.isUserAddress = (force != undefined || vm.user.address != '');
- vm.label_userAddress = vm.isUserAddress ? 'Address:' : 'Enter Address:';
- }
-
- function changeVehicleRegLabel(force) {
- vm.isVehicleReg = (force != undefined || vm.vehicle.reg != '');
- vm.label_vehicleReg = vm.isVehicleReg ? 'Vehicle Registration Number:' : 'Enter Vehicle Reg Number:';
- }
- // listen to changes in input fields [END]
-
// populate regular treatment list
function getRegularTreatments() {
vm.problemPromise = amServices.getRegularTreatments().then(success).catch(failure);
@@ -1183,55 +1509,57 @@
}
}
- function populateRoundOffVal() {
- vm.roundedOffVal = vm.service.cost - serviceTotalCost;
+ function populateRoD() {
+ if (vm.isDiscountApplied) {
+ vm.discountValue = serviceTcDc - vm.service.cost;
+ calculateDiscount(false);
+ } else if (vm.isRoundOffVal)
+ vm.roundedOffVal = vm.service.cost - serviceTcRo;
+ }
+
+ function calculateRoundOff(isRoundOffManual) {
+ if (!isRoundOffManual) {
+ var ot = totalCost = vm.service.cost;
+ totalCost = vm.isRoundOffVal ? Math.floor(totalCost * 0.1) * 10 : totalCost;
+ vm.roundedOffVal = (totalCost - ot);
+ }
+ calculateCost();
+ }
+
+ function calculateDiscount(isDiscountByPercent) {
+ var totalCost = vm.service.cost;
+ if (isDiscountByPercent) {
+ vm.discountValue = totalCost * parseFloat(vm.discountPercentage) / 100;
+ vm.discountValue = (isNaN(vm.discountValue) || vm.discountValue == null) ? '' : vm.discountValue;
+ } else if (vm.discountValue != '')
+ vm.discountPercentage = 100 * parseFloat(vm.discountValue) / totalCost;
+ calculateCost();
}
function changeForceStopCalCost(bool) {
forceStopCalCost = bool;
- isManualRoundOff = true;
}
- function calculateCost(isDbp, isMro) {
+ function calculateCost() {
if (forceStopCalCost)
return;
- isDiscountByPercent = (isDbp != undefined) ? isDbp : isDiscountByPercent;
- isManualRoundOff = (isMro != undefined) ? isMro : isManualRoundOff;
var totalCost = 0;
- serviceTotalCost = 0;
vm.service.problems.forEach(iterateProblem);
vm.selectedInventories.forEach(iterateInventories);
if (vm.serviceType == vm.serviceTypeList[1]) {
vm.packages.forEach(iteratePackages);
}
+ serviceTcDc = totalCost;
if (vm.isDiscountApplied) {
- if (isDiscountByPercent) {
- var dv = totalCost * parseFloat(vm.discountPercentage) / 100;
- totalCost = vm.isDiscountApplied && !isNaN(dv) ? totalCost - dv : totalCost;
- vm.discountValue = (dv % 1 != 0) ? dv.toFixed(2) : dv;
- vm.discountValue = (isNaN(vm.discountValue) || vm.discountValue == null) ? '' : vm.discountValue;
- delete dv;
- } else if (vm.discountValue != '') {
- var dv = parseFloat(vm.discountValue);
- vm.discountPercentage = 100 * dv / totalCost;
- vm.discountPercentage = (vm.discountPercentage % 1 != 0) ? vm.discountPercentage.toFixed(2) : vm.discountPercentage;
- totalCost -= dv;
- delete dv;
- }
+ totalCost = vm.isDiscountApplied && !isNaN(vm.discountValue) ? totalCost - vm.discountValue : totalCost;
}
- serviceTotalCost = totalCost;
+ serviceTcRo = totalCost;
if (vm.isRoundOffVal) {
- if (!isManualRoundOff) {
- var ot = totalCost;
- totalCost = vm.isRoundOffVal ? Math.floor(totalCost * 0.1) * 10 : totalCost;
- vm.roundedOffVal = (totalCost - ot);
- vm.roundedOffVal = (vm.roundedOffVal % 1 != 0) ? vm.roundedOffVal.toFixed(2) : vm.roundedOffVal;
- delete ot;
- } else {
- totalCost += parseFloat(vm.roundedOffVal);
- }
+ totalCost += parseFloat(vm.roundedOffVal);
+ serviceTcDc += parseFloat(vm.roundedOffVal);
}
totalCost = (totalCost % 1 != 0) ? totalCost.toFixed(2) : totalCost;
+ totalCost = (totalCost % 1).toFixed(2) == 0.00 ? Math.round(totalCost) : totalCost;
vm.service.cost = totalCost;
function iterateProblem(element) {
@@ -1264,7 +1592,7 @@
function iterateProblems(problem) {
if ((vm.sTaxSettings && !vm.sTaxSettings.applyTax) || !problem.tax || !problem.checked)
return;
- totalTax += parseFloat(problem.tax.toFixed(2));
+ totalTax += parseFloat(problem.tax);
}
function iteratePackages(package) {
@@ -1276,7 +1604,7 @@
function ipt(treatment) {
if ((vm.sTaxSettings && !vm.sTaxSettings.applyTax) || !treatment.tax)
return;
- totalTax += parseFloat(treatment.tax[vm.vehicle.type.toLowerCase().replace(' ', '-')].toFixed(2));
+ totalTax += parseFloat(treatment.tax[vm.vehicle.type.toLowerCase().replace(' ', '-')]);
}
}
@@ -1332,7 +1660,7 @@
} else {
vm.problem.rate = (rate == '' || rate == undefined ? vm.problem.rate : rate);
vm.problem.tax = (vm.problem.rate * vm.sTaxSettings.tax / 100);
- vm.problem.amount = Math.round(vm.problem.rate + vm.problem.tax);
+ vm.problem.amount = vm.problem.rate + vm.problem.tax;
}
} else {
if (vm.sTaxSettings.inclusive)
@@ -1346,7 +1674,7 @@
function validate() {
if (vm.user.name == '') {
- changeUserTab(true);
+ changeUserInfoState(true);
setTimeout(doFocus, 300);
utils.showSimpleToast('Please Enter Name');
@@ -1358,7 +1686,7 @@
var isVehicleBlank = (vm.vehicle.manuf == undefined || vm.vehicle.manuf == '') && (vm.vehicle.model == undefined || vm.vehicle.model == '') && (vm.vehicle.reg == undefined || vm.vehicle.reg == '');
if (isVehicleBlank) {
- changeVehicleTab(true);
+ changeVehicleInfoState(true);
utils.showSimpleToast('Please Enter At Least One Vehicle Detail');
return false;
}
@@ -1390,7 +1718,9 @@
}
vm.service.problems = vm.selectedProblems;
var options = {
- isLastInvoiceNoChanged: (vm.service.invoiceno == olInvoiceNo)
+ isLastInvoiceNoChanged: (vm.service.invoiceno == olInvoiceNo),
+ isLastEstimateNoChanged: (vm.service.estimateno == olEstimateNo),
+ isLastJobCardNoChanged: (vm.service.jobcardno == olJobCardNo)
}
vm.user.memberships = vm.membershipChips;
switch (vm.serviceType) {
@@ -1401,8 +1731,10 @@
vm.membershipChips.forEach(addMsToService);
break;
}
- vm.service.status = vm.servicestatus ? 'paid' : 'billed';
+ vm.service.status = vm.servicestatus ? 'paid' : 'due';
vm.service.date = moment(vm.service.date).format();
+ if (vm.isNextDueService)
+ vm.vehicle.nextdue = moment(vm.nextDueDate).format();
if (vm.isDiscountApplied) {
vm.service['discount'] = {
percent: parseFloat(vm.discountPercentage),
@@ -1429,6 +1761,20 @@
}
vm.selectedInventories.forEach(iterateInventories);
vm.service.inventories = vm.selectedInventories;
+ switch (vm.service.state) {
+ case vm.serviceStateList[0]:
+ delete vm.service.invoiceno;
+ delete vm.service.estimateno;
+ break;
+ case vm.serviceStateList[1]:
+ delete vm.service.jobcardno;
+ delete vm.service.invoiceno;
+ break;
+ case vm.serviceStateList[2]:
+ delete vm.service.jobcardno;
+ delete vm.service.estimateno;
+ break;
+ }
amServices.saveService(vm.user, vm.vehicle, vm.service, options).then(success).catch(failure);
function addMsToService(membership) {
diff --git a/src/app/components/services/services-edit.controller.js b/src/app/components/services/services-edit.controller.js
index a5984a71..a8521e82 100644
--- a/src/app/components/services/services-edit.controller.js
+++ b/src/app/components/services/services-edit.controller.js
@@ -2,7 +2,7 @@
* Controller for Edit Service component
* @author ndkcha
* @since 0.4.1
- * @version 0.6.1
+ * @version 0.6.4
*/
///
@@ -12,7 +12,7 @@
.controller('amCtrlSeUI', ServiceEditController)
.controller('amCtrlMeD', MembershipEditDialogController);
- ServiceEditController.$inject = ['$state', '$q', '$log', '$filter', '$mdEditDialog', '$mdDialog', 'utils', 'amServices'];
+ ServiceEditController.$inject = ['$scope', '$state', '$q', '$log', '$filter', '$timeout', '$mdEditDialog', '$mdDialog', '$mdSidenav', 'utils', 'amServices'];
MembershipEditDialogController.$inject = ['$mdDialog', '$filter', 'membership', 'treatments'];
/*
@@ -20,7 +20,7 @@
> Do not create new method named moment() since it is used by moment.js
*/
- function ServiceEditController($state, $q, $log, $filter, $mdEditDialog, $mdDialog, utils, amServices) {
+ function ServiceEditController($scope, $state, $q, $log, $filter, $timeout, $mdEditDialog, $mdDialog, $mdSidenav, utils, amServices) {
// initialize view model
var vm = this;
@@ -29,16 +29,18 @@
isDiscountByPercent = true,
isManualRoundOff = false,
isFirstTimeLoad = true,
- serviceTotalCost = 0,
- forceStopCalCost = false;
+ serviceTcRo = 0,
+ serviceTcDc = 0,
+ forceStopCalCost = false,
+ olInvoiceNo = 0,
+ olJobCardNo = 0,
+ olEstimateNo = 0,
+ isInvoice = false,
+ isEstimate = false,
+ isJobCard = false,
+ wasNextDueService = false;
// vm assignments to keep track of UI related elements
- vm.label_userMobile = 'Enter Mobile Number:';
- vm.label_userEmail = 'Enter Email:';
- vm.label_userAddress = 'Enter Address:';
- vm.label_vehicleReg = 'Enter Vehicle Registration Number:';
- vm.label_vehicleManuf = 'Manufacturer:';
- vm.label_vehicleModel = 'Model:';
vm.vehicleTypeList = [];
vm.user = {
id: '',
@@ -58,8 +60,11 @@
date: new Date(),
odo: 0,
cost: 0,
- invoiceno: 1,
status: '',
+ state: '',
+ invoiceno: undefined,
+ jobcardno: undefined,
+ estimateno: undefined,
problems: []
};
vm.problem = {
@@ -90,6 +95,15 @@
total: ''
};
vm.totalCost = 0;
+ vm.isUserInfoExpanded = true;
+ vm.isVehicleInfoExpanded = false;
+ vm.isServiceInfoExpanded = false;
+ vm.serviceStateList = ['Job Card', 'Estimate', 'Bill'];
+ vm.service.state = vm.serviceStateList[0];
+ vm.label_invoice = 'Invoice';
+ vm.isNextDueService = false;
+ vm.nextDueDate = new Date();
+ vm.nextDueDate.setMonth(vm.nextDueDate.getMonth() + 3);
// named assignments to handle behaviour of UI elements
vm.redirect = {
@@ -102,25 +116,19 @@
vm.searchVehicleChange = searchVehicleChange;
vm.manufacturersQuerySearch = manufacturersQuerySearch;
vm.modelQuerySearch = modelQuerySearch;
- vm.changeUserMobileLabel = changeUserMobileLabel;
- vm.changeUserEmailLabel = changeUserEmailLabel;
- vm.changeVehicleRegLabel = changeVehicleRegLabel;
- vm.changeVehicleTab = changeVehicleTab;
vm.changeVehicleType = changeVehicleType;
vm.treatmentsQuerySearch = treatmentsQuerySearch;
vm.onProblemSelected = onProblemSelected;
vm.onProblemDeselected = onProblemDeselected;
vm.isAddOperation = isAddOperation;
- vm.changeServiceTab = changeServiceTab;
vm.updateTreatmentDetails = updateTreatmentDetails;
vm.finalizeNewProblem = finalizeNewProblem;
vm.save = save;
- vm.changeUserAddressLabel = changeUserAddressLabel;
vm.queryMembershipChip = queryMembershipChip;
vm.OnClickMembershipChip = OnClickMembershipChip;
vm.calculateCost = calculateCost;
vm.OnAddMembershipChip = OnAddMembershipChip;
- vm.navigateToSubscriptMembership = navigateToSubscriptMembership;
+ vm.navigateToSubscribeMembership = navigateToSubscribeMembership;
vm.goBack = goBack;
vm.changeProblemRate = changeProblemRate;
vm.changeServiceTax = changeServiceTax;
@@ -138,20 +146,378 @@
vm.calculateVat = calculateVat;
vm.changeQty = changeQty;
vm.changeInventoryTotal = changeInventoryTotal;
- vm.populateRoundOffVal = populateRoundOffVal;
+ vm.populateRoD = populateRoD;
vm.changeForceStopCalCost = changeForceStopCalCost;
- vm.calculateViewportHeight = calculateViewportHeight;
+ vm.unsubscribeMembership = unsubscribeMembership;
+ vm.label_titleCustomerMoreInfo = label_titleCustomerMoreInfo;
+ vm.changeUserInfoState = changeUserInfoState;
+ vm.changeVehicleInfoState = changeVehicleInfoState;
+ vm.changeServiceInfoState = changeServiceInfoState;
+ vm.openCustomerMoreDetails = buildDelayedToggler('customer-more-right');
+ vm.closeCustomerMoreDetails = closeCustomerMoreDetails;
+ vm.openServiceDetailsPanel = buildDelayedToggler('service-details-left');
+ vm.fetchFocusItemAfterSS = fetchFocusItemAfterSS;
+ vm.lockServiceNavbar = lockServiceNavbar;
+ vm.IsMembershipTreatmentsDisabled = IsMembershipTreatmentsDisabled;
+ vm.IsNoMembershipSubscribed = IsNoMembershipSubscribed;
+ vm.IsMembershipEnabled = IsMembershipEnabled;
+ vm.IsPackageEnabled = IsPackageEnabled;
+ vm.convertVehicleTypeToAF = convertVehicleTypeToAF;
+ vm.IsTreatmentAmountEditable = IsTreatmentAmountEditable;
+ vm.IsTreatmentAmountText = IsTreatmentAmountText;
+ vm.IsPackageEnabled = IsPackageEnabled;
+ vm.changeDisplayAsList = changeDisplayAsList;
+ vm.IsTreatmentRateDisplayed = IsTreatmentRateDisplayed;
+ vm.changeInventoryAsList = changeInventoryAsList;
+ vm.IsInventoryTotalEditable = IsInventoryTotalEditable;
+ vm.IsInventoryTotalText = IsInventoryTotalText;
+ vm.IsServiceStateSelected = IsServiceStateSelected;
+ vm.selectServiceState = selectServiceState;
+ vm.WhichServiceStateEnabled = WhichServiceStateEnabled;
+ vm.autoCapitalizeCustomerAddress = autoCapitalizeCustomerAddress;
+ vm.autoCapitalizeVehicleModel = autoCapitalizeVehicleModel;
+ vm.calculateSubtotal = calculateSubtotal;
+ vm.doRoundOff = doRoundOff;
+ vm.calculateRoundOff = calculateRoundOff;
+ vm.calculateDiscount = calculateDiscount;
+ vm.isRoD = isRoD;
+ vm.IsSubtotalEnabled = IsSubtotalEnabled;
+ vm.IsServiceStateJc = IsServiceStateJc;
+ vm.IsServiceStateEs = IsServiceStateEs;
+ vm.IsServiceStateIv = IsServiceStateIv;
+ vm.getDate = getDate;
// default execution steps
+ setCoverPic();
+ buildDelayedToggler('service-details-left');
+ changeServiceInfoState(true);
getVehicleTypes();
- changeServiceTab(true);
getPackages();
getMemberships();
+ // watchers
+ $(window).on('resize', OnWindowResize);
+
// function definitions
- function calculateViewportHeight(element) {
- vm.serviceViewportHeight = $(window).height() - (2*element[0].offsetTop + 0.45*element[0].offsetTop);
+ function getDate(date) {
+ return moment(date).format('DD MMM YYYY');
+ }
+
+ function IsServiceStateIv(state) {
+ if (!IsServiceStateSelected(state))
+ return false;
+ return (vm.service.state == vm.serviceStateList[2]);
+ }
+
+ function IsServiceStateEs(state) {
+ if (!IsServiceStateSelected(state))
+ return false;
+ return (vm.service.state == vm.serviceStateList[1]);
+ }
+
+ function IsServiceStateJc(state) {
+ if (!IsServiceStateSelected(state))
+ return false;
+ return (vm.service.state == vm.serviceStateList[0]);
+ }
+
+ function OnWindowResize() {
+ if (vm.isServiceInfoExpanded)
+ setServicesVpHeight();
+ }
+
+ function setServicesVpHeight() {
+ $('#am-service-viewport').height($(window).height() - ($('#am-service-viewport').offset().top + 15));
+ }
+
+ function IsSubtotalEnabled() {
+ return (vm.isDiscountApplied || vm.isRoundOffVal || (vm.sTaxSettings && vm.sTaxSettings.applyTax) || (vm.vatSettings && vm.vatSettings.applyTax));
+ }
+
+ function isRoD() {
+ return (vm.isDiscountApplied || vm.isRoundOffVal);
+ }
+
+ function doRoundOff(input) {
+ if (input == '')
+ return 0;
+ return ((input % 1 != 0) ? input.toFixed(2) : parseInt(input));
+ }
+
+ function calculateSubtotal() {
+ var totalCost = 0;
+ vm.service.problems.forEach(iterateProblem);
+ vm.selectedInventories.forEach(iterateInventories);
+ if (vm.serviceType == vm.serviceTypeList[1]) {
+ vm.packages.forEach(iteratePackages);
+ }
+ totalCost = (totalCost % 1 != 0) ? totalCost.toFixed(2) : parseInt(totalCost);
+ return totalCost;
+
+ function iterateProblem(element) {
+ totalCost += parseFloat(element.rate ? (element.rate * (element.checked ? 1 : 0)) : 0);
+ }
+
+ function iterateInventories(element) {
+ totalCost += parseFloat(element.rate ? ((element.rate * element.qty) * (element.checked ? 1 : 0)) : 0);
+ }
+
+ function iteratePackages(package) {
+ if (!package.checked)
+ return;
+ package.selectedTreatments.forEach(ipt);
+ }
+
+ function ipt(treatment) {
+ totalCost += treatment.rate[vm.vehicle.type.toLowerCase().replace(' ', '-')];
+ }
+ }
+
+ function autoCapitalizeVehicleModel() {
+ vm.vehicle.model = utils.autoCapitalizeWord(vm.vehicle.model);
+ }
+
+ function autoCapitalizeVehicleManuf() {
+ vm.vehicle.manuf = utils.autoCapitalizeWord(vm.vehicle.manuf);
+ }
+
+ function autoCapitalizeCustomerAddress() {
+ vm.user.address = utils.autoCapitalizeWord(vm.user.address);
+ }
+
+ function getLastJobCardNo() {
+ amServices.getLastJobCardNo().then(success).catch(failure);
+
+ function success(res) {
+ if (vm.service.jobcardno != undefined)
+ return;
+ vm.service.jobcardno = ++res;
+ olJobCardNo = res;
+ }
+
+ function failure(err) {
+ vm.service.jobcardno = 1;
+ olJobCardNo = 1;
+ }
+ }
+
+ function getLastEstimateNo() {
+ amServices.getLastEstimateNo().then(success).catch(failure);
+
+ function success(res) {
+ if (vm.service.estimateno != undefined)
+ return;
+ vm.service.estimateno = ++res;
+ olEstimateNo = res;
+ }
+
+ function failure(err) {
+ vm.service.estimateno = 1;
+ olEstimateNo = 1;
+ }
+ }
+
+ // get last invoice number from database
+ function getLastInvoiceNo() {
+ amServices.getLastInvoiceNo().then(success).catch(failure);
+
+ function success(res) {
+ if (vm.service.invoiceno != undefined)
+ return;
+ vm.service.invoiceno = ++res;
+ olInvoiceNo = res;
+ }
+
+ function failure(err) {
+ vm.service.invoiceno = 1;
+ olInvoiceNo = 1;
+ }
+ }
+
+ function WhichServiceStateEnabled(index) {
+ return (IsServiceStateSelected(vm.serviceStateList[index]));
+ }
+
+ function selectServiceState(state) {
+ vm.service.state = state;
+ vm.label_invoice = (vm.service.state == vm.serviceStateList[2]) ? 'Invoice' : 'Send';
+ }
+
+ function IsServiceStateSelected(state) {
+ return (vm.service.state == state);
+ }
+
+ function IsInventoryTotalText() {
+ return (vm.vatSettings && !vm.vatSettings.inclusive && vm.vatSettings.applyTax);
+ }
+
+ function IsInventoryTotalEditable() {
+ return (vm.vatSettings && (vm.vatSettings.inclusive || !vm.vatSettings.applyTax));
+ }
+
+ function changeInventoryAsList(bool) {
+ vm.displayInventoriesAsList = bool;
+ }
+
+ function IsTreatmentRateDisplayed() {
+ return (vm.sTaxSettings && vm.sTaxSettings.applyTax && !vm.sTaxSettings.inclusive);
+ }
+
+ function changeDisplayAsList(bool) {
+ vm.displayTreatmentAsList = bool;
+ }
+
+ function IsPackageEnabled() {
+ return (vm.packages.length < 1);
+ }
+
+ function IsTreatmentAmountText() {
+ return (vm.sTaxSettings && !vm.sTaxSettings.inclusive && vm.sTaxSettings.applyTax);
+ }
+
+ function IsTreatmentAmountEditable() {
+ return (vm.sTaxSettings && (vm.sTaxSettings.inclusive || !vm.sTaxSettings.applyTax));
+ }
+
+ function convertVehicleTypeToAF() {
+ return (vm.vehicle.type.toLowerCase().replace(' ', '-'));
+ }
+
+ function IsPackageEnabled() {
+ return (vm.serviceType == vm.serviceTypeList[1]);
+ }
+
+ function IsMembershipEnabled() {
+ return (vm.serviceType == vm.serviceTypeList[2]);
+ }
+
+ function IsNoMembershipSubscribed() {
+ return (vm.membershipChips.length < 1);
+ }
+
+ function IsMembershipTreatmentsDisabled(membership, treatment) {
+ return (membership.calculateTOccurenceLeft(treatment) <= 0 || membership.calculateTDurationLeft(treatment) <= 0);
+ }
+
+ function lockServiceNavbar() {
+ return $mdMedia('gt-md');
+ }
+
+ function fetchFocusItemAfterSS() {
+ changeServiceInfoState(true, null, true);
+ }
+
+ function setCoverPic() {
+ var source = localStorage.getItem('cover-pic');
+ $('#am-sp-cover-pic').attr('src', (source) ? source : 'assets/img/logo-250x125px.png').width(250).height(125);
+ }
+
+ function label_titleCustomerMoreInfo() {
+ return (vm.user.name ? vm.user.name + "'s" : "Customer");
+ }
+
+ function closeCustomerMoreDetails() {
+ $mdSidenav('customer-more-right').close();
+ setTimeout(cvis, 800);
+
+ function cvis() {
+ changeVehicleInfoState(true);
+ }
+ }
+
+ // Supplies a function that will continue to operate until the time is up.
+ function debounce(func, wait, context) {
+ var timer;
+ return function debounced() {
+ var context = $scope,
+ args = Array.prototype.slice.call(arguments);
+ $timeout.cancel(timer);
+ timer = $timeout(function() {
+ timer = undefined;
+ func.apply(context, args);
+ }, wait || 10);
+ };
+ }
+
+ // Build handler to open/close a SideNav; when animation finishes report completion in console
+ function buildDelayedToggler(navID) {
+ return debounce(function() {
+ $mdSidenav(navID).toggle();
+ }, 200);
+ }
+
+ function focusServiceState() {
+ $('#ami-service-state').focus();
+ }
+
+ function focusInvoiceNo() {
+ $('#ami-service-invoice-no').focus();
+ }
+
+ function focusUserName() {
+ $('#ami-user-name input').focus();
+ }
+
+ function focusVehicleManuf() {
+ $('#ami-vehicle-manuf input').focus();
+ }
+
+ function changeUserInfoState(expanded) {
+ vm.isUserInfoExpanded = expanded;
+ if (expanded)
+ setTimeout(focusUserName, 300);
+ vm.isVehicleInfoExpanded = true;
+ vm.isServiceInfoExpanded = false;
+ }
+
+ function changeVehicleInfoState(expanded, event) {
+ if (event != undefined) {
+ if (event.keyCode != 9)
+ return;
+ }
+ vm.isVehicleInfoExpanded = expanded;
+ if (expanded)
+ setTimeout(focusVehicleManuf, 300);
+ vm.isUserInfoExpanded = true;
+ vm.isServiceInfoExpanded = false;
+ }
+
+ function changeServiceInfoState(expanded, event, isAlreadyThere) {
+ if (event != undefined) {
+ if (event.keyCode != 9)
+ return;
+ }
+ if (expanded) {
+ if (!isAlreadyThere)
+ setTimeout(focusInvoiceNo, 1300);
+ else
+ setTimeout(focusServiceState, 300);
+ }
+ vm.isServiceInfoExpanded = expanded;
+ if (expanded)
+ setTimeout(setServicesVpHeight, 500);
+ vm.isUserInfoExpanded = false;
+ vm.isVehicleInfoExpanded = false;
+ }
+
+ function unsubscribeMembership(ev, chip) {
+ var confirm = $mdDialog.confirm()
+ .textContent('Unsubscribe to ' + chip.name + ' ?')
+ .ariaLabel('Unsubscribe to ' + chip.name)
+ .targetEvent(ev)
+ .ok('Yes')
+ .cancel('No');
+
+ $mdDialog.show(confirm).then(performDelete, ignoreDelete);
+
+ function performDelete() {
+ console.info('deleted');
+ }
+
+ function ignoreDelete() {
+ vm.membershipChips.push(chip);
+ }
}
function changeInventoryTotal(inventory) {
@@ -168,7 +534,7 @@
function iterateInventories(element) {
if ((vm.vatSettings && !vm.vatSettings.applyTax) || !element.tax || !element.checked)
return;
- totalTax += parseFloat(element.tax.toFixed(2) * (element.qty ? element.qty : 1));
+ totalTax += parseFloat(element.tax * (element.qty ? element.qty : 1));
}
}
@@ -279,42 +645,49 @@
function success(res) {
vm.inventories = res;
- existingInventories.forEach(iterateInventories);
+ addExistingInventories(existingInventories);
getVatSettings();
- function iterateInventories(inventory) {
- if (inventory.name != '') {
- if (inventory.qty == undefined)
- inventory.qty = 1;
- var found = $filter('filter')(vm.inventories, {
- name: inventory.name
- }, true);
- if (found.length == 1) {
- found[0].checked = true;
- found[0].rate = inventory.rate;
- found[0].amount = inventory.rate;
- found[0].qty = inventory.qty;
- vm.selectedInventories.push(found[0]);
- } else {
- vm.inventories.push({
- name: inventory.name,
- rate: inventory.rate,
- amount: inventory.rate,
- qty: inventory.qty,
- checked: true
- });
- vm.selectedInventories.push(vm.inventories[vm.inventories.length - 1]);
- }
- }
- }
+
}
function failure(err) {
vm.inventories = [];
+ addExistingInventories(existingInventories);
getVatSettings();
}
}
+ function addExistingInventories(existingInventories) {
+ existingInventories.forEach(iterateInventories);
+
+ function iterateInventories(inventory) {
+ if (inventory.name != '') {
+ if (inventory.qty == undefined)
+ inventory.qty = 1;
+ var found = $filter('filter')(vm.inventories, {
+ name: inventory.name
+ }, true);
+ if (found.length == 1) {
+ found[0].checked = true;
+ found[0].rate = inventory.rate;
+ found[0].amount = inventory.rate;
+ found[0].qty = inventory.qty;
+ vm.selectedInventories.push(found[0]);
+ } else {
+ vm.inventories.push({
+ name: inventory.name,
+ rate: inventory.rate,
+ amount: inventory.rate,
+ qty: inventory.qty,
+ checked: true
+ });
+ vm.selectedInventories.push(vm.inventories[vm.inventories.length - 1]);
+ }
+ }
+ }
+ }
+
function getVatSettings() {
amServices.getVatSettings().then(success).catch(failure);
@@ -369,8 +742,6 @@
inventory.rate = inventory.amount;
inventory.tax = (inventory.rate * vm.vatSettings.tax / 100);
inventory.amount = inventory.rate + inventory.tax;
- if (inventory.amount % 1 != 0)
- inventory.amount = parseFloat(inventory.amount).toFixed(2);
}
} else if (force) {
if (vm.vatSettings.inclusive)
@@ -419,7 +790,7 @@
if (!problem.rate)
problem.rate = problem.amount;
problem.tax = (problem.rate * vm.sTaxSettings.tax / 100);
- problem.amount = Math.round(problem.rate + problem.tax);
+ problem.amount = problem.rate + problem.tax;
}
} else if (force) {
if (vm.sTaxSettings.inclusive) {
@@ -497,8 +868,9 @@
OnAddMembershipChip(chip);
}
- function navigateToSubscriptMembership() {
- vm.userTab = true;
+ function navigateToSubscribeMembership() {
+ changeUserInfoState(true);
+ vm.openCustomerMoreDetails();
}
function OnClickMembershipChip(event) {
@@ -733,7 +1105,7 @@
treatment.tax[cvt] = (treatment.rate[cvt] * vm.sTaxSettings.tax / 100);
} else {
treatment.tax[cvt] = (treatment.rate[cvt] * vm.sTaxSettings.tax / 100);
- treatment.amount[cvt] = Math.round(treatment.rate[cvt] + treatment.tax[cvt]);
+ treatment.amount[cvt] = treatment.rate[cvt] + treatment.tax[cvt];
}
} else if (force) {
if (vm.sTaxSettings.inclusive)
@@ -808,14 +1180,10 @@
vm.user.email = res.email;
vm.user.mobile = res.mobile;
vm.user.address = res.address;
- changeUserEmailLabel();
- changeUserMobileLabel();
- changeUserAddressLabel();
if (res.memberships)
Object.keys(res.memberships).forEach(iterateMemberships);
vm.vehicle.id = $state.params.vehicleId;
vm.vehicle.reg = res.vehicle.reg;
- changeVehicleRegLabel();
vm.vehicle.manuf = res.vehicle.manuf;
vm.vehicle.model = res.vehicle.model;
vm.vehicle.type = res.vehicle.type;
@@ -829,16 +1197,24 @@
}
vm.service.id = $state.params.serviceId;
vm.service.date = new Date(res.vehicle.service.date);
+ if (res.vehicle.nextdue && (res.vehicle.nextdue.localeCompare(moment().format()) > 0)) {
+ wasNextDueService = true;
+ vm.isNextDueService = true;
+ vm.nextDueDate = new Date(res.vehicle.nextdue);
+ } else {
+ wasNextDueService = false;
+ vm.isNextDueService = false;
+ }
vm.service.cost = res.vehicle.service.cost;
vm.service.odo = res.vehicle.service.odo;
- vm.service.invoiceno = res.vehicle.service.invoiceno;
vm.service.status = res.vehicle.service.status;
+ vm.service.state = (res.vehicle.service.state == undefined) ? vm.serviceStateList[2] : res.vehicle.service.state;
+ vm.label_invoice = (vm.service.state == vm.serviceStateList[2]) ? 'Invoice' : 'Send';
if (res.vehicle.service.discount) {
vm.isDiscountApplied = true;
isDiscountByPercent = false;
vm.discountPercentage = parseFloat(res.vehicle.service.discount.percent);
vm.discountValue = parseFloat(res.vehicle.service.discount.amount);
- console.log(res.vehicle.service.discount.amount);
}
if (res.vehicle.service.roundoff) {
vm.isRoundOffVal = true;
@@ -852,6 +1228,21 @@
vm.servicestatus = (res.vehicle.service.status == 'paid');
getRegularTreatments(res.vehicle.service.problems);
getInventories(res.vehicle.service.inventories);
+ if (res.vehicle.service.jobcardno != undefined) {
+ vm.service.jobcardno = res.vehicle.service.jobcardno;
+ isJobCard = true;
+ }
+ if (res.vehicle.service.estimateno != undefined) {
+ vm.service.estimateno = res.vehicle.service.estimateno;
+ isEstimate = true;
+ }
+ if (res.vehicle.service.invoiceno != undefined) {
+ vm.service.invoiceno = res.vehicle.service.invoiceno;
+ isInvoice = true;
+ }
+ getLastJobCardNo();
+ getLastEstimateNo();
+ getLastInvoiceNo();
function iterateMemberships(membership) {
res.memberships[membership].name = membership;
@@ -1000,11 +1391,13 @@
// vehicle manufacturer is updated from UI, clear model list to populate new list w.r.t. manufacturer
function searchVehicleChange() {
+ autoCapitalizeVehicleManuf();
if (!autofillVehicle) {
vm.models = [];
vm.vehicle.model = '';
autofillVehicle = false;
- }
+ } else
+ autofillVehicle = false;
}
// replace all the treatment values with updated vehicle type
@@ -1027,7 +1420,7 @@
} else {
problem.rate = (rate == '' || rate == undefined ? problem.rate : rate);
problem.tax = (problem.rate * vm.sTaxSettings.tax / 100);
- problem.amount = Math.round(problem.rate + problem.tax);
+ problem.amount = problem.rate + problem.tax;
}
} else {
problem.rate = (rate == '' || rate == undefined ? problem.rate : rate);
@@ -1043,38 +1436,6 @@
}
// return boolean response to different configurations [END]
- // change vehicle tab selector variable
- function changeVehicleTab(bool) {
- vm.vehicleTab = bool;
- }
-
- // change service tab selector variable
- function changeServiceTab(bool) {
- vm.serviceTab = bool;
- }
-
- // listen to changes in input fields [BEGIN]
- function changeUserMobileLabel(force) {
- vm.isUserMobile = (force != undefined || vm.user.mobile != '');
- vm.label_userMobile = vm.isUserMobile ? 'Mobile:' : 'Enter Mobile Number:';
- }
-
- function changeUserEmailLabel(force) {
- vm.isUserEmail = (force != undefined || vm.user.email != '');
- vm.label_userEmail = vm.isUserEmail ? 'Email:' : 'Enter Email:';
- }
-
- function changeUserAddressLabel(force) {
- vm.isUserAddress = (force != undefined || vm.user.address != '');
- vm.label_userAddress = vm.isUserAddress ? 'Address:' : 'Enter Address:';
- }
-
- function changeVehicleRegLabel(force) {
- vm.largeVehicleRegLabel = (force != undefined || vm.vehicle.reg != '');
- vm.label_vehicleReg = vm.largeVehicleRegLabel ? 'Vehicle Registration Number:' : 'Enter Vehicle Registration Number:';
- }
- // listen to changes in input fields [END]
-
// populate regular treatment list
function getRegularTreatments(existingProblems) {
amServices.getRegularTreatments().then(success).catch(failure);
@@ -1156,55 +1517,54 @@
}
}
- function populateRoundOffVal() {
- vm.roundedOffVal = vm.service.cost - serviceTotalCost;
+ function populateRoD() {
+ if (vm.isDiscountApplied) {
+ vm.discountValue = serviceTcDc - vm.service.cost;
+ calculateDiscount(false);
+ } else if (vm.isRoundOffVal)
+ vm.roundedOffVal = vm.service.cost - serviceTcRo;
+ }
+
+ function calculateRoundOff(isRoundOffManual) {
+ if (!isRoundOffManual) {
+ var ot = totalCost = vm.service.cost;
+ totalCost = vm.isRoundOffVal ? Math.floor(totalCost * 0.1) * 10 : totalCost;
+ vm.roundedOffVal = (totalCost - ot);
+ }
+ calculateCost();
+ }
+
+ function calculateDiscount(isDiscountByPercent) {
+ var totalCost = vm.service.cost;
+ if (isDiscountByPercent) {
+ vm.discountValue = totalCost * parseFloat(vm.discountPercentage) / 100;
+ vm.discountValue = (isNaN(vm.discountValue) || vm.discountValue == null) ? '' : vm.discountValue;
+ } else if (vm.discountValue != '')
+ vm.discountPercentage = 100 * parseFloat(vm.discountValue) / totalCost;
+ calculateCost();
}
function changeForceStopCalCost(bool) {
- forceStopCalCost = bool;
- isManualRoundOff = true;
+ forceStopCalCost = bool;
}
- function calculateCost(isDbp, isMro) {
+ function calculateCost(isDbp) {
if (forceStopCalCost)
return;
- isDiscountByPercent = (isDbp != undefined) ? isDbp : isDiscountByPercent;
- isManualRoundOff = (isMro != undefined) ? isMro : isManualRoundOff;
var totalCost = 0;
- serviceTotalCost = 0;
vm.service.problems.forEach(iterateProblem);
vm.selectedInventories.forEach(iterateInventories);
if (vm.serviceType == vm.serviceTypeList[1]) {
vm.packages.forEach(iteratePackages);
}
+ serviceTcDc = totalCost;
if (vm.isDiscountApplied) {
- if (isDiscountByPercent) {
- var dv = totalCost * parseFloat(vm.discountPercentage) / 100;
- totalCost = vm.isDiscountApplied && !isNaN(dv) ? totalCost - dv : totalCost;
- vm.discountValue = (dv % 1 != 0) ? dv.toFixed(2) : dv;
- vm.discountValue = (vm.discountValue % 1).toFixed(2) == 0.00 ? Math.round(vm.discountValue) : vm.discountValue;
- vm.discountValue = (isNaN(vm.discountValue) || vm.discountValue == null) ? '' : vm.discountValue;
- totalCost = (totalCost % 1).toFixed(2) == 0.00 ? Math.round(totalCost) : totalCost;
- delete dv;
- } else if (vm.discountValue != '') {
- var dv = parseFloat(vm.discountValue);
- vm.discountPercentage = 100 * dv / totalCost;
- vm.discountPercentage = (vm.discountPercentage % 1 != 0) ? vm.discountPercentage.toFixed(2) : vm.discountPercentage;
- totalCost -= dv;
- delete dv;
- }
+ totalCost = vm.isDiscountApplied && !isNaN(vm.discountValue) ? totalCost - vm.discountValue : totalCost;
}
- serviceTotalCost = totalCost;
+ serviceTcRo = totalCost;
if (vm.isRoundOffVal) {
- if (!isManualRoundOff) {
- var ot = totalCost;
- totalCost = vm.isRoundOffVal ? Math.floor(totalCost * 0.1) * 10 : totalCost;
- vm.roundedOffVal = (totalCost - ot);
- vm.roundedOffVal = (vm.roundedOffVal % 1 != 0) ? vm.roundedOffVal.toFixed(2) : vm.roundedOffVal;
- delete ot;
- } else {
- totalCost += parseFloat(vm.roundedOffVal);
- }
+ totalCost += parseFloat(vm.roundedOffVal);
+ serviceTcDc += parseFloat(vm.roundedOffVal);
}
totalCost = (totalCost % 1 != 0) ? totalCost.toFixed(2) : totalCost;
totalCost = (totalCost % 1).toFixed(2) == 0.00 ? Math.round(totalCost) : totalCost;
@@ -1240,7 +1600,7 @@
function iterateProblems(problem) {
if ((vm.sTaxSettings && !vm.sTaxSettings.applyTax) || !problem.tax || !problem.checked)
return;
- totalTax += parseFloat(problem.tax.toFixed(2));
+ totalTax += parseFloat(problem.tax);
}
function iteratePackages(package) {
@@ -1252,7 +1612,7 @@
function ipt(treatment) {
if ((vm.sTaxSettings && !vm.sTaxSettings.applyTax) || !treatment.tax)
return;
- totalTax += parseFloat(treatment.tax[vm.vehicle.type.toLowerCase().replace(' ', '-')].toFixed(2));
+ totalTax += parseFloat(treatment.tax[vm.vehicle.type.toLowerCase().replace(' ', '-')]);
}
}
@@ -1301,7 +1661,7 @@
} else {
vm.problem.rate = (rate == '' || rate == undefined ? vm.problem.rate : rate);
vm.problem.tax = (vm.problem.rate * vm.sTaxSettings.tax / 100);
- vm.problem.amount = Math.round(vm.problem.rate + vm.problem.tax);
+ vm.problem.amount = vm.problem.rate + vm.problem.tax;
}
} else {
if (vm.sTaxSettings.inclusive)
@@ -1317,7 +1677,7 @@
var isVehicleBlank = (vm.vehicle.manuf == undefined || vm.vehicle.manuf == '') && (vm.vehicle.model == undefined || vm.vehicle.model == '') && (vm.vehicle.reg == undefined || vm.vehicle.reg == '');
if (isVehicleBlank) {
- changeVehicleTab(true);
+ changeVehicleInfoState(true);
utils.showSimpleToast('Please Enter At Least One Vehicle Detail');
return false;
}
@@ -1357,8 +1717,12 @@
vm.membershipChips.forEach(addMsToService);
break;
}
- vm.service.status = vm.servicestatus ? 'paid' : 'billed';
+ vm.service.status = vm.servicestatus ? 'paid' : 'due';
vm.service.date = moment(vm.service.date).format();
+ if (vm.isNextDueService)
+ vm.vehicle.nextdue = moment(vm.nextDueDate).format();
+ else if (wasNextDueService)
+ vm.vehicle.nextdue = undefined;
vm.service.problems.forEach(iterateProblems);
if (vm.isDiscountApplied) {
vm.service['discount'] = {
@@ -1385,7 +1749,32 @@
}
vm.selectedInventories.forEach(iterateInventories);
vm.service.inventories = vm.selectedInventories;
- amServices.saveService(vm.user, vm.vehicle, vm.service).then(success).catch(failure);
+ var options = {
+ isLastInvoiceNoChanged: (vm.service.invoiceno == olInvoiceNo),
+ isLastEstimateNoChanged: (vm.service.estimateno == olEstimateNo),
+ isLastJobCardNoChanged: (vm.service.jobcardno == olJobCardNo)
+ }
+ switch (vm.service.state) {
+ case vm.serviceStateList[0]:
+ if (!isInvoice)
+ delete vm.service.invoiceno;
+ if (!isEstimate)
+ delete vm.service.estimateno;
+ break;
+ case vm.serviceStateList[1]:
+ if (!isJobCard)
+ delete vm.service.jobcardno;
+ if (!isInvoice)
+ delete vm.service.invoiceno;
+ break;
+ case vm.serviceStateList[2]:
+ if (!isJobCard)
+ delete vm.service.jobcardno;
+ if (!isEstimate)
+ delete vm.service.estimateno;
+ break;
+ }
+ amServices.saveService(vm.user, vm.vehicle, vm.service, options).then(success).catch(failure);
function addMsToService(membership) {
if (!membership.checked)
@@ -1481,7 +1870,7 @@
// !(save successfull)
function failure(err) {
- console.log(err);
+ console.info(err);
utils.showSimpleToast('Failed to update. Please Try Again!');
}
}
diff --git a/src/app/components/services/services-viewall.controller.js b/src/app/components/services/services-viewall.controller.js
index 7275ec87..2d8ac03c 100644
--- a/src/app/components/services/services-viewall.controller.js
+++ b/src/app/components/services/services-viewall.controller.js
@@ -2,20 +2,21 @@
* Controller for View Services module
* @author ndkcha
* @since 0.4.1
- * @version 0.6.1
+ * @version 0.6.4
*/
///
(function() {
- angular.module('automintApp')
- .controller('amCtrlSeRA', ServiceViewAllController);
+ const ammPreferences = require('./automint_modules/am-preferences.js');
+
+ angular.module('automintApp').controller('amCtrlSeRA', ServiceViewAllController);
ServiceViewAllController.$inject = ['$scope', '$state', '$filter', '$timeout', '$mdDialog', 'utils', 'amServices'];
function ServiceViewAllController($scope, $state, $filter, $timeout, $mdDialog, utils, amServices) {
// initialize view model
- var vm = this, queryChangedPromise, cacheLoadTimeout = false;
+ var vm = this, queryChangedPromise, cacheLoadTimeout = false, isDataLoaded = false, isPreferencesLoaded = false, filterRange, isFirstTimeWsq = true;
// named assginments for tracking UI elements
vm.query = {
@@ -23,37 +24,14 @@
page: 1,
total: 0
};
- vm.filter = {
- month: 0,
- year: 0
- }
vm.services = [];
- // month indexes will start from zero
- vm.displayDataOptions = [{
- name: 'This Month',
- month: 0,
- year: 0
- }, {
- name: 'Last 2 Months',
- month: 1,
- year: 0
- }, {
- name: 'Last 6 Months',
- month: 5,
- year: 0
- }, {
- name: 'Last Year',
- month: 0,
- year: 1
- }, {
- name: 'Everything',
- month: -1,
- year: -1
- }];
- vm.displayDataFor = vm.displayDataOptions[0].name;
vm.serviceQuery = '';
vm.isQueryMode = false;
vm.displayItemPage = 1;
+ vm.sortColumns = '';
+ vm.serviceStateList = ['Job Card', 'Estimate', 'Bill'];
+ vm.currentTimeSet = [];
+ vm.ddTimeSet = '';
// function maps
vm.addService = addService;
@@ -63,36 +41,248 @@
vm.changeQueryMode = changeQueryMode;
vm.goToInvoice = goToInvoice;
vm.getServiceDate = getServiceDate;
+ vm.sortByColumns = sortByColumns;
+ vm.IsServiceDue = IsServiceDue;
+ vm.IsServiceStateJc = IsServiceStateJc;
+ vm.IsServiceStateEs = IsServiceStateEs;
+ vm.IsServiceStateIv = IsServiceStateIv;
+ vm.openTimeFilter = openTimeFilter;
// default execution steps
- $scope.$watch('vm.displayDataFor', watchDisplayDataFor);
$scope.$watch('vm.serviceQuery', watchServiceQuery);
-
+ getFilterMonths(processPreferences);
+ initCurrentTimeSet();
+
// function definitions
+
+ function openTimeFilter(event) {
+ $mdDialog.show({
+ controller: 'amCtrlSeTmFl',
+ controllerAs: 'vm',
+ templateUrl: 'app/components/services/tmpl/dialog_timefilter.html',
+ parent: angular.element(document.body),
+ targetEvent: event,
+ locals: {
+ filterRange: filterRange,
+ currentTimeSet: vm.currentTimeSet
+ },
+ clickOutsideToClose: true
+ }).then(success).catch(success);
+
+ function success(res) {
+ if (!res)
+ return;
+ vm.currentTimeSet = res;
+ getServices();
+ displayCurrentTimeSet();
+ ammPreferences.storePreference('viewServices.showingDataFor', vm.ddTimeSet);
+ }
+ }
+
+ function getFilterMonths() {
+ var callback = arguments[0];
+ var callingFunction = this;
+ var callbackArgs = arguments;
+ amServices.getFilterMonths().then(success).catch(failure);
+
+ function success(res) {
+ filterRange = res;
+ callback.apply(callingFunction, Array.prototype.slice.call(callbackArgs, 1));
+ }
+
+ function failure(err) {
+ callback.apply(callingFunction, Array.prototype.slice.call(callbackArgs, 1));
+ console.info('failed to get filter months');
+ }
+ }
+
+ function initCurrentTimeSet() {
+ vm.currentTimeSet.push({
+ month: moment().format('MMM'),
+ year: moment().format('YYYY')
+ });
+ displayCurrentTimeSet();
+ }
+
+ function displayCurrentTimeSet() {
+ vm.ddTimeSet = '';
+ var years = [];
+ vm.currentTimeSet.forEach(iterateTimeSets);
+ years.forEach(iterateYears);
+ vm.ddTimeSet = vm.ddTimeSet.substr(0, vm.ddTimeSet.length - 2);
+
+ function iterateYears(y) {
+ var tyf = $filter('filter')(vm.currentTimeSet, {
+ year: y
+ }, true);
+
+ tyf.forEach(iterateFoundYear);
+ vm.ddTimeSet += y + '; ';
+
+ function iterateFoundYear(fy) {
+ vm.ddTimeSet += moment(fy.month, 'MMM').format('MMMM') + ', ';
+ }
+ }
+
+ function iterateTimeSets(ts) {
+ var tyf = $filter('filter')(years, ts.year, true);
+
+ if (tyf.length == 0)
+ years.push(ts.year);
+ }
+ }
+
+ function IsServiceStateIv(state) {
+ return (state == vm.serviceStateList[2]);
+ }
+
+ function IsServiceStateEs(state) {
+ return (state == vm.serviceStateList[1]);
+ }
+
+ function IsServiceStateJc(state) {
+ return (state == vm.serviceStateList[0]);
+ }
+
+ function IsServiceDue(status) {
+ return (status == 'Due');
+ }
+
+ function sortByColumns(isBlockSave) {
+ if (vm.sortColumns == '' || vm.sortColumns == undefined)
+ return;
+ switch (vm.sortColumns) {
+ case "date":
+ vm.services.sort(sortAColumnByDate);
+ break;
+ case "-date":
+ vm.services.sort(sortDColumnByDate);
+ break;
+ case "customerName":
+ vm.services.sort(sortAColumnByCustomerName);
+ break;
+ case "-customerName":
+ vm.services.sort(sortDColumnByCustomerName);
+ break;
+ case "vehicle":
+ vm.services.sort(sortAColumnByVehicle);
+ break;
+ case "-vehicle":
+ vm.services.sort(sortDColumnByVehicle);
+ break;
+ case "amount":
+ vm.services.sort(sortAColumnByAmount);
+ break;
+ case "-amount":
+ vm.services.sort(sortDColumnByAmount);
+ break;
+ case "payment":
+ vm.services.sort(sortAColumnByPayment);
+ break;
+ case "-payment":
+ vm.services.sort(sortDColumnByPayment);
+ break;
+ }
+
+ if (isPreferencesLoaded && !((typeof(isBlockSave) === "boolean") && isBlockSave))
+ ammPreferences.storePreference('viewServices.sort', vm.sortColumns.replace('-', '') + '.' + ((vm.sortColumns.indexOf('-') == 0) ? 'descending' : 'ascending'));
+ }
+
+ function sortAColumnByPayment(lhs, rhs) {
+ return lhs.srvc_status.localeCompare(rhs.srvc_status);
+ }
+
+ function sortDColumnByPayment(lhs, rhs) {
+ return rhs.srvc_status.localeCompare(lhs.srvc_status);
+ }
+
+ function sortAColumnByAmount(lhs, rhs) {
+ return (parseFloat(lhs.srvc_cost) - parseFloat(rhs.srvc_cost));
+ }
+
+ function sortDColumnByAmount(lhs, rhs) {
+ return (parseFloat(rhs.srvc_cost) - parseFloat(lhs.srvc_cost));
+ }
+
+ function sortAColumnByVehicle(lhs, rhs) {
+ var lhsv = ((lhs.vhcl_manuf) ? lhs.vhcl_manuf : '') + ' ' + ((lhs.vhcl_model) ? lhs.vhcl_model : '') + ' ' + ((lhs.vhcl_reg) ? lhs.vhcl_reg : '');
+ var rhsv = ((rhs.vhcl_manuf) ? rhs.vhcl_manuf : '') + ' ' + ((rhs.vhcl_model) ? rhs.vhcl_model : '') + ' ' + ((rhs.vhcl_reg) ? rhs.vhcl_reg : '');
+ return lhsv.localeCompare(rhsv);
+ }
+
+ function sortDColumnByVehicle(lhs, rhs) {
+ var lhsv = ((lhs.vhcl_manuf) ? lhs.vhcl_manuf : '') + ' ' + ((lhs.vhcl_model) ? lhs.vhcl_model : '') + ' ' + ((lhs.vhcl_reg) ? lhs.vhcl_reg : '');
+ var rhsv = ((rhs.vhcl_manuf) ? rhs.vhcl_manuf : '') + ' ' + ((rhs.vhcl_model) ? rhs.vhcl_model : '') + ' ' + ((rhs.vhcl_reg) ? rhs.vhcl_reg : '');
+ return rhsv.localeCompare(lhsv);
+ }
+
+ function sortAColumnByCustomerName(lhs, rhs) {
+ return lhs.cstmr_name.localeCompare(rhs.cstmr_name);
+ }
+
+ function sortDColumnByCustomerName(lhs, rhs) {
+ return rhs.cstmr_name.localeCompare(lhs.cstmr_name);
+ }
+
+ function sortAColumnByDate(lhs, rhs) {
+ return lhs.srvc_date.localeCompare(rhs.srvc_date);
+ }
+
+ function sortDColumnByDate(lhs, rhs) {
+ return rhs.srvc_date.localeCompare(lhs.srvc_date);
+ }
+
+ function processPreferences() {
+ ammPreferences.getAllPreferences('viewServices').then(success).catch(failure);
+
+ function success(res) {
+ if (res['viewServices.sort']) {
+ var t = res['viewServices.sort'].split('.');
+ vm.sortColumns = ((t[1] == 'descending') ? "-" : "") + t[0];
+ }
+ if (res['viewServices.showingDataFor']) {
+ var sdf = res['viewServices.showingDataFor'].split(';');
+ vm.currentTimeSet = [];
+ sdf.forEach(iterateDateRange);
+ displayCurrentTimeSet();
+ }
+
+ isPreferencesLoaded = true;
+ getServices();
+
+ function iterateDateRange(dr) {
+ var m = dr.split(',');
+ for (var i = 0; i < (m.length - 1); i++) {
+ vm.currentTimeSet.push({
+ month: moment(m[i].replace(' ', ''), "MMMM").format("MMM"),
+ year: m[m.length - 1].replace(' ', '')
+ });
+ }
+ }
+ }
+
+ function failure(err) {
+ isPreferencesLoaded = true;
+ getServices();
+ console.warn(err.message);
+ }
+ }
function getServiceDate(date) {
return moment(date).format('DD MMM YYYY');
}
function watchServiceQuery(newValue, oldValue) {
+ if (isFirstTimeWsq) {
+ isFirstTimeWsq = false;
+ return;
+ }
if(queryChangedPromise){
$timeout.cancel(queryChangedPromise);
}
queryChangedPromise = $timeout(getServices, 500);
}
- // listen to changes in display data settings
- function watchDisplayDataFor(newValue, oldValue) {
- var found = $filter('filter')(vm.displayDataOptions, {
- name: newValue
- });
- if (found.length == 1) {
- vm.filter.month = found[0].month;
- vm.filter.year = found[0].year;
- getServices();
- }
- }
-
// toggle boolean to indicate searching operation
function changeQueryMode(bool) {
vm.isQueryMode = bool;
@@ -111,11 +301,13 @@
// fill datatable with list of services
function getServices() {
vm.showPaginationBar = (vm.serviceQuery == '');
- vm.promise = amServices.getServices(vm.filter.month, vm.filter.year, vm.serviceQuery).then(success).catch(failure);
+ vm.promise = (isPreferencesLoaded) ? amServices.getServices(vm.currentTimeSet, vm.serviceQuery).then(success).catch(failure) : undefined;
function success(res) {
+ isDataLoaded = true;
vm.services = res;
vm.query.total = res.length;
+ sortByColumns(true);
}
function failure(err) {
@@ -158,7 +350,7 @@
}
function ignoreDelete() {
- console.log('nope');
+ console.info('nope');
}
@@ -171,7 +363,7 @@
}
function failure(err) {
- console.log(err);
+ console.info(err);
utils.showSimpleToast('Service can not be deleted at moment. Please Try Again!');
}
}
diff --git a/src/app/components/services/services.factory.js b/src/app/components/services/services.factory.js
index 1f385be5..6beae693 100644
--- a/src/app/components/services/services.factory.js
+++ b/src/app/components/services/services.factory.js
@@ -2,7 +2,7 @@
* Factory that handles database interactions between services database and controller
* @author ndkcha
* @since 0.4.1
- * @version 0.6.1
+ * @version 0.6.4
*/
///
@@ -11,9 +11,9 @@
angular.module('automintApp')
.factory('amServices', ServicesFactory);
- ServicesFactory.$inject = ['$http', '$timeout', '$q', '$log', 'utils', '$amRoot', 'constants', 'pdbCustomers', 'pdbCommon', 'pdbConfig', 'pdbCache'];
+ ServicesFactory.$inject = ['$http', '$timeout', '$q', '$log', '$filter', 'utils', '$amRoot', 'constants', 'pdbCustomers', 'pdbCommon', 'pdbConfig', 'pdbCache'];
- function ServicesFactory($http, $timeout, $q, $log, utils, $amRoot, constants, pdbCustomers, pdbCommon, pdbConfig, pdbCache) {
+ function ServicesFactory($http, $timeout, $q, $log, $filter, utils, $amRoot, constants, pdbCustomers, pdbCommon, pdbConfig, pdbCache) {
// initialize factory variable and function maps
var factory = {
getManufacturers: getManufacturers,
@@ -34,13 +34,70 @@
getServices: getServices,
getInventories: getInventories,
getVatSettings: getVatSettings,
- getInventoriesSettings: getInventoriesSettings
+ getInventoriesSettings: getInventoriesSettings,
+ getLastEstimateNo : getLastEstimateNo,
+ getLastJobCardNo: getLastJobCardNo,
+ getDefaultServiceType: getDefaultServiceType,
+ getFilterMonths: getFilterMonths
}
return factory;
// function definitions
+ function getFilterMonths() {
+ var tracker = $q.defer();
+ pdbCache.get(constants.pdb_cache_views.view_services).then(generateMonthsUsed).catch(failure);
+ return tracker.promise;
+
+ function generateMonthsUsed(res) {
+ var result = [];
+ Object.keys(res).forEach(iterateDateRange);
+ tracker.resolve(result);
+
+ function iterateDateRange(dr) {
+ if (dr.match(/_id|_rev/g))
+ return;
+ var temp = dr.split('-');
+ result.push({
+ month: utils.convertToTitleCase(temp[0]),
+ year: temp[1]
+ });
+ }
+ }
+
+ function failure(err) {
+ tracker.reject(err);
+ }
+ }
+
+ function getDefaultServiceType() {
+ var tracker = $q.defer();
+ $amRoot.isSettingsId().then(getSettingsDoc).catch(failure);
+ return tracker.promise;
+
+ function getSettingsDoc(res) {
+ pdbConfig.get($amRoot.docIds.settings).then(getSettingsObject).catch(failure);
+ }
+
+ function getSettingsObject(res) {
+ if (res.settings && res.settings.servicestate)
+ tracker.resolve(res.settings.servicestate);
+ else
+ failure();
+ }
+
+ function failure(err) {
+ if (!err) {
+ err = {
+ success: false,
+ message: 'Could not find service state'
+ }
+ }
+ tracker.reject(err);
+ }
+ }
+
function getInventoriesSettings() {
var tracker = $q.defer();
$amRoot.isSettingsId().then(configFound).catch(failure);
@@ -294,48 +351,37 @@
}
}
- function getServices(filterMonth, filterYear, query) {
+ function getServices(dateRange, query) {
query = angular.lowercase(query);
- filterMonth += (12*filterYear);
var tracker = $q.defer();
pdbCache.get(constants.pdb_cache_views.view_services).then(success).catch(failure);
return tracker.promise;
function success(res) {
- var result = [], ltm = filterMonth, currentRange = '';
- if (filterMonth < 0 && filterYear < 0) {
- Object.keys(res).forEach(iterateDateRange);
-
- function iterateDateRange(dr) {
- currentRange = dr;
- if (currentRange.match(/_id|_rev/g))
- return;
- if (res[currentRange])
- Object.keys(res[currentRange]).forEach(iterateService);
- }
- } else {
- do {
- var queryDate = moment().subtract({
- months: ltm
- });
- currentRange = moment(queryDate).format('MMM YYYY');
- currentRange = angular.lowercase(currentRange).replace(' ', '-');
- if (res[currentRange])
- Object.keys(res[currentRange]).forEach(iterateService);
- ltm--;
- } while(ltm >= 0);
- }
- result.sort(dateSort);
+ var result = [], currentRange = '';
+ Object.keys(res).forEach(iterateDateRange);
tracker.resolve(result);
-
- function dateSort(lhs, rhs) {
- return rhs.srvc_date.localeCompare(lhs.srvc_date);
+
+ function iterateDateRange(dr) {
+ if (dr.match(/_id|_rev/g))
+ return;
+ var crd = dr.split('-');
+ var crdfound = $filter('filter')(dateRange, {
+ month: utils.convertToTitleCase(crd[0]),
+ year: crd[1]
+ }, true);
+
+ if (crdfound.length == 0)
+ return;
+ currentRange = dr;
+ if (res[currentRange])
+ Object.keys(res[currentRange]).forEach(iterateService);
}
function iterateService(sId) {
var target = res[currentRange][sId];
if (query != undefined) {
- if (query != undefined && (target.cstmr_name && angular.lowercase(target.cstmr_name).search(query) > -1) || (target.srvc_status && angular.lowercase(target.srvc_status).search(query) > -1) || (target.vhcl_manuf && angular.lowercase(target.vhcl_manuf).search(query) > -1) || (target.vhcl_model && angular.lowercase(target.vhcl_model).search(query) > -1) || (target.vhcl_reg && angular.lowercase(target.vhcl_reg).search(query) > -1) || (target.srvc_cost && target.srvc_cost.toString().search(query) > -1) || (target.srvc_date && angular.lowercase(target.srvc_date).search(query) > -1)) {
+ if (query != undefined && (target.cstmr_name && angular.lowercase(target.cstmr_name).search(query) > -1) || (target.srvc_state && angular.lowercase(target.srvc_state).search(query) > -1) || (target.srvc_status && angular.lowercase(target.srvc_status).search(query) > -1) || (target.vhcl_manuf && angular.lowercase(target.vhcl_manuf).search(query) > -1) || (target.vhcl_model && angular.lowercase(target.vhcl_model).search(query) > -1) || (target.vhcl_reg && angular.lowercase(target.vhcl_reg).search(query) > -1) || (target.srvc_cost && target.srvc_cost.toString().search(query) > -1) || (target.srvc_date && angular.lowercase(target.srvc_date).search(query) > -1)) {
target.srvc_status = utils.convertToTitleCase(target.srvc_status);
target.srvc_id = sId;
result.push(target);
@@ -348,6 +394,7 @@
}
}
function failure(err) {
+ console.log(err);
tracker.reject(err);
}
}
@@ -522,7 +569,8 @@
manuf: vehicle.manuf,
model: vehicle.model,
name: vehicle.manuf + ' - ' + vehicle.model + (vehicle.reg == '' ? '' : ', ' + vehicle.reg),
- type: (vehicle.type) ? vehicle.type : ''
+ type: (vehicle.type) ? vehicle.type : '',
+ nextdue: vehicle.nextdue
});
}
}
@@ -571,7 +619,8 @@
manuf: vehicle.manuf,
model: vehicle.model,
name: vehicle.manuf + ' - ' + vehicle.model + (vehicle.reg == '' || vehicle.reg == undefined ? '' : ', ' + vehicle.reg),
- type: (vehicle.type) ? vehicle.type : ''
+ type: (vehicle.type) ? vehicle.type : '',
+ nextdue: vehicle.nextdue
});
}
}
@@ -623,8 +672,14 @@
delete newService.id;
delete newVehicle.id;
delete newUser.id;
- if (options && options.isLastInvoiceNoChanged)
- saveLastInvoiceNo(newService.invoiceno);
+ if (options) {
+ if (newService.invoiceno && options.isLastInvoiceNoChanged)
+ saveLastInvoiceNo(newService.invoiceno);
+ if (newService.estimateno && options.isLastEstimateNoChanged)
+ saveLastEstimateNo(newService.estimateno);
+ if (newService.jobcardno && options.isLastJobCardNoChanged)
+ saveLastJobCardNo(newService.jobcardno);
+ }
pdbCustomers.get(newUserId).then(foundExistingUser).catch(noUserFound);
return tracker.promise;
@@ -650,6 +705,8 @@
}
function iterateVehicleFields(vfn) {
+ if (newVehicle[vfn] == undefined)
+ delete res.user.vehicles[newVehicleId][vfn];
res.user.vehicles[newVehicleId][vfn] = newVehicle[vfn];
}
}
@@ -823,6 +880,60 @@
tracker.reject(error);
}
}
+
+ function getLastJobCardNo() {
+ var tracker = $q.defer();
+ $amRoot.isSettingsId().then(getSettingsDoc).catch(failure);
+ return tracker.promise;
+
+ function getSettingsDoc(res) {
+ pdbConfig.get($amRoot.docIds.settings).then(getSettingsObject).catch(failure);
+ }
+
+ function getSettingsObject(res) {
+ if (res.settings && res.settings.invoices && res.settings.invoices.lastJobCardNo)
+ tracker.resolve(res.settings.invoices.lastJobCardNo);
+ else
+ failure();
+ }
+
+ function failure(err) {
+ if (!err) {
+ err = {
+ success: false,
+ message: 'No invoice settings found!'
+ }
+ }
+ tracker.reject(err);
+ }
+ }
+
+ function getLastEstimateNo() {
+ var tracker = $q.defer();
+ $amRoot.isSettingsId().then(getSettingsDoc).catch(failure);
+ return tracker.promise;
+
+ function getSettingsDoc(res) {
+ pdbConfig.get($amRoot.docIds.settings).then(getSettingsObject).catch(failure);
+ }
+
+ function getSettingsObject(res) {
+ if (res.settings && res.settings.invoices && res.settings.invoices.lastEstimateNo)
+ tracker.resolve(res.settings.invoices.lastEstimateNo);
+ else
+ faillure();
+ }
+
+ function failure(err) {
+ if (!err) {
+ err = {
+ success: false,
+ message: 'No invoice settings found!'
+ }
+ }
+ tracker.reject(err);
+ }
+ }
// get last invoice number
function getLastInvoiceNo() {
@@ -886,5 +997,73 @@
$log.info('Cannot save invoice settings');
}
}
+
+ function saveLastEstimateNo(leno) {
+ $amRoot.isSettingsId().then(getSettingsDoc).catch(failure);
+
+ function getSettingsDoc(res) {
+ pdbConfig.get($amRoot.docIds.settings).then(getSettingsObject).catch(writeSettingsObject);
+ }
+
+ function getSettingsObject(res) {
+ if (!res.settings)
+ res.settings = {};
+ if (!res.settings.invoices)
+ res.settings.invoices = {};
+ res.settings.invoices.lastEstimateNo = leno;
+ pdbConfig.save(res);
+ }
+
+ function writeSettingsObject(err) {
+ var doc = {
+ _id: utils.generateUUID('sttngs'),
+ creator: $amRoot.username,
+ settings: {
+ invoices: {
+ lastEstimateNo: 1
+ }
+ }
+ }
+ pdbConfig.save(doc);
+ }
+
+ function failure(err) {
+ $log.info('Cannot save estimate settings');
+ }
+ }
+
+ function saveLastJobCardNo(ljbno) {
+ $amRoot.isSettingsId().then(getSettingsDoc).catch(failure);
+
+ function getSettingsDoc(res) {
+ pdbConfig.get($amRoot.docIds.settings).then(getSettingsObject).catch(writeSettingsObject);
+ }
+
+ function getSettingsObject(res) {
+ if (!res.settings)
+ res.settings = {};
+ if (!res.settings.invoices)
+ res.settings.invoices = {};
+ res.settings.invoices.lastJobCardNo = ljbno;
+ pdbConfig.save(res);
+ }
+
+ function writeSettingsObject(err) {
+ var doc = {
+ _id: utils.generateUUID('sttngs'),
+ creator: $amRoot.username,
+ settings: {
+ invoices: {
+ lastJobCardNo: 1
+ }
+ }
+ }
+ pdbConfig.save(doc);
+ }
+
+ function failure(err) {
+ $log.info('Cannot save jobcard settings');
+ }
+ }
}
})();
\ No newline at end of file
diff --git a/src/app/components/services/services_add.html b/src/app/components/services/services_add.html
index 27a6c9a1..8e9bc28c 100644
--- a/src/app/components/services/services_add.html
+++ b/src/app/components/services/services_add.html
@@ -1,4 +1,40 @@
arrow_back
Back
-
-
-
-
-
-
- person_pin
-
-
- {{user.name}}
-
-
-
-
-
- phone
-
-
-
-
- email
-
-
-
-
-
-
- home
-
-
-
-
-
- card_membership
-
-
-
-
- {{membership.name}}
-
-
-
- {{$chip.name}}
-
-
-
- * Click on Membership for details
+
+
+ {{vm.label_titleCustomerMoreInfo()}} Information
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Continue
+ Continue to Add Service
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{type}}
+
+
+
+
+
+
+
+
+
+
+ Customer:
+ {{vm.user.name}}, (M) {{vm.user.mobile}}
+
+
+
+
+
+
+
+ {{user.name}}
+
+
+
+
+
+
+
+
+
+ More Details
+ more
+ More About Customer
+
@@ -114,104 +248,85 @@
Please wait
-
- Continue
- navigate_next
-
+
+
+
+
+
+
+ Vehicle:
+ {{vm.vehicle.manuf}} {{vm.vehicle.model}} - {{vm.vehicle.reg}}
-
-
-
-
-
-
-
- Choose Vehicle:
-
-
- {{vm.currentVehicle}}
-
-
-
-
- New Vehicle
-
-
-
-
- {{vehicle.name}}
-
-
-
-
- (To add new vehicle, click on the button above and select new vehicle)
-
-
-
-
- Choose Manufacturer:
-
+
+
+
+
+
{{manuf}}
-
- Choose Model:
-
+
+
+
{{model}}
+
+
+
+
+
+
+ directions_car
+ Change Vehicle
+
+
+
+
+ {{vehicle.name}}
+
+
+
+
+ New Vehicle
+
+
+
+
+
+
-
-
-
-
- e.g. GJ01AB9999
-
-
-
-
-
- Continue
- navigate_next
-
-
-
-
-
-
-
-
-
-
- {{type}}
-
-
-
-
-
-
-
-
-
- {{type}}
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ Service Details
+
+ Click to Expand
+
+
+
+
+
+
+
+ {{state}}
+
+
+ {{state}}
+
+ >>
+
+
+
@@ -229,13 +344,14 @@
add_circle_outline
remove_circle_outline
+ CollapseExpand Membership
{{membership.name}}
-
+
@@ -246,7 +362,7 @@
-
+
| {{treatment.name}} |
{{membership.calculateTOccurenceLeft(treatment)}} |
{{membership.calculateTDurationLeft(treatment)}} |
@@ -257,12 +373,14 @@
-
- {{vm.user.name || 'Customer'}} has not subscribed to any memberships. Click here to subscribe to one
+
+ {{vm.user.name || 'Customer'}} has not subscribed to any memberships. Click here to subscribe to one
+
+
+
+
@@ -286,6 +404,7 @@
add_circle_outline
remove_circle_outline
+ CollapseExpand Package
@@ -298,8 +417,8 @@
{{(package.total ? package.total * (package.checked ? 1 : 0) : 0)}}
-
-
+
+
@@ -479,15 +574,14 @@
-
- Show All
-
+
+ Show AllShow All Inventories
+
|
|
|
-
- |
+ |
|
@@ -504,53 +598,41 @@
|
-
- {{inventory.tax * (inventory.qty ? inventory.qty : 1) | number: 2}}
+ |
+ {{vm.doRoundOff(inventory.tax * inventory.qty)}}
|
-
- {{inventory.total}}
+
+ {{vm.doRoundOff(inventory.total)}}
|
|
-
+
{{inventory.name}}
|
-
-
+
+
|
-
+
|
-
+
|
-
- {{vm.inventory.tax * (vm.inventory.qty ? vm.inventory.qty : 1) | number: 2}}
+ |
+ {{vm.doRoundOff(vm.inventory.tax * vm.inventory.qty)}}
|
-
- {{vm.inventory.total}}
+
+ {{vm.doRoundOff(vm.inventory.total)}}
|
-
-
- |
-
-
- add
- Add More
-
- |
-
-
@@ -560,15 +642,14 @@
-
- Show Few
-
+
+ Show FewShow Selected Inventories
+
|
|
|
-
- |
+ |
|
@@ -585,96 +666,98 @@
|
-
- {{inventory.tax * (inventory.qty ? inventory.qty : 1) | number: 2}}
+ |
+ {{vm.doRoundOff(inventory.tax * inventory.qty)}}
|
-
- {{inventory.total}}
+
+ {{vm.doRoundOff(inventory.total)}}
|
|
-
+
{{inventory.name}}
|
-
-
+
+
|
-
+
|
-
+
|
-
- {{vm.inventory.tax * (vm.inventory.qty ? vm.inventory.qty : 1) | number: 2}}
+ |
+ {{vm.doRoundOff(vm.inventory.tax * vm.inventory.qty)}}
|
-
- {{vm.inventory.total}}
+
+ {{vm.doRoundOff(vm.inventory.total)}}
|
-
-
- |
-
-
- add
- Add More
-
- |
-
-
-
-
-
-
-
-
-
+
+
+
\ No newline at end of file
diff --git a/src/app/components/services/services_viewAll.html b/src/app/components/services/services_viewAll.html
index 79f464e1..dbc69aae 100644
--- a/src/app/components/services/services_viewAll.html
+++ b/src/app/components/services/services_viewAll.html
@@ -1,46 +1,42 @@
-
-
-
- person_add
- Add Service
+
+
+ person_add
+ Add Service
+
+
+
+ Showing data for : {{vm.ddTimeSet}}
+
+ date_range
+
+
+ search
-
-
- Display Data For:
-
- {{opt.name}}
-
-
- search
-
-
-
- Display Data For:
-
- {{opt.name}}
-
-
-
-
- close
+
+
+ Showing data for : {{vm.ddTimeSet}}
+
+ date_range
+
+
+ close
+
-
+
- |
- |
- |
-
(Rs.) |
- |
+ |
+ |
+ |
+
(Rs.) |
+ |
@@ -49,11 +45,9 @@
{{service.vhcl_manuf + ' ' + service.vhcl_model}} ({{service.vhcl_reg}}) |
{{vm.getServiceDate(service.srvc_date)}} |
{{service.srvc_cost}} |
- {{service.srvc_status}} |
+ {{service.srvc_status}} |
+ {{service.srvc_state}} |
-
- Invoice
-
delete
diff --git a/src/app/components/services/tmpl/dialog_timefilter.controller.js b/src/app/components/services/tmpl/dialog_timefilter.controller.js
new file mode 100644
index 00000000..c58f0d1d
--- /dev/null
+++ b/src/app/components/services/tmpl/dialog_timefilter.controller.js
@@ -0,0 +1,108 @@
+/**
+ * Controller for Time Filter dialog box
+ * @author ndkcha
+ * @since 0.6.4
+ * @version 0.6.4
+ */
+
+///
+
+(function() {
+ angular.module('automintApp').controller('amCtrlSeTmFl', TimeFilterController);
+
+ TimeFilterController.$inject = ['$mdDialog', '$filter', 'filterRange', 'currentTimeSet'];
+
+ function TimeFilterController($mdDialog, $filter, filterRange, currentTimeSet) {
+ var vm = this;
+
+ vm.currentYearIndex = 0;
+ vm.yearRange = [];
+ vm.selectedDateSet = $.extend([], currentTimeSet);
+
+ // default execution steps
+ populateYearRange();
+
+ // function mappings
+ vm.IsNextYear = IsNextYear;
+ vm.IsPreviousYear = IsPreviousYear;
+ vm.changeToNextYear = changeToNextYear;
+ vm.changeToPreviousYear = changeToPreviousYear;
+ vm.selectDateSet = selectDateSet;
+ vm.IsDateSetSelected = IsDateSetSelected;
+ vm.IsDateSetDisabled = IsDateSetDisabled;
+ vm.confirm = confirm;
+
+ // function definitions
+
+ function confirm() {
+ if (vm.selectedDateSet.length < 1)
+ vm.selectedDateSet = currentTimeSet;
+ $mdDialog.hide(vm.selectedDateSet);
+ }
+
+ function IsDateSetDisabled(month) {
+ var temp_m = moment(month, 'M').format('MMM');
+ var found = $filter('filter')(filterRange, {
+ year: vm.yearRange[vm.currentYearIndex],
+ month: temp_m
+ }, true);
+
+ return (found.length == 0);
+ }
+
+ function IsDateSetSelected(month) {
+ var temp_m = moment(month, 'M').format('MMM');
+ var found = $filter('filter')(vm.selectedDateSet, {
+ year: vm.yearRange[vm.currentYearIndex],
+ month: temp_m
+ }, true);
+
+ return (found.length == 1);
+ }
+
+ function selectDateSet(month) {
+ var temp_m = moment(month, 'M').format('MMM');
+ var found = $filter('filter')(vm.selectedDateSet, {
+ year: vm.yearRange[vm.currentYearIndex],
+ month: temp_m
+ }, true);
+
+ if (found.length == 0) {
+ vm.selectedDateSet.push({
+ year: vm.yearRange[vm.currentYearIndex],
+ month: temp_m
+ });
+ } else {
+ var i = vm.selectedDateSet.indexOf(found[0]);
+ vm.selectedDateSet.splice(i, 1);
+ }
+ }
+
+ function changeToNextYear() {
+ vm.currentYearIndex--;
+ }
+
+ function changeToPreviousYear() {
+ vm.currentYearIndex++;
+ }
+
+ function IsNextYear() {
+ return (vm.currentYearIndex != 0);
+ }
+
+ function IsPreviousYear() {
+ return (vm.currentYearIndex != (vm.yearRange.length - 1));
+ }
+
+ function populateYearRange() {
+ filterRange.forEach(iterateYearRange);
+
+ function iterateYearRange(item) {
+ var found = $filter('filter')(vm.yearRange, item.year, true);
+
+ if (found == 0)
+ vm.yearRange.push(item.year);
+ }
+ }
+ }
+})();
\ No newline at end of file
diff --git a/src/app/components/services/tmpl/dialog_timefilter.html b/src/app/components/services/tmpl/dialog_timefilter.html
new file mode 100644
index 00000000..90cae099
--- /dev/null
+++ b/src/app/components/services/tmpl/dialog_timefilter.html
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+ |
+
+ arrow_back
+
+ |
+
+
+ {{vm.yearRange[vm.currentYearIndex]}}
+
+ |
+
+
+ arrow_forward
+
+ |
+
+
+
+
+ |
+
+ Jan
+
+ |
+
+
+ Feb
+
+ |
+
+
+ Mar
+
+ |
+
+
+ |
+
+ Apr
+
+ |
+
+
+ May
+
+ |
+
+
+ Jun
+
+ |
+
+
+ |
+
+ Jul
+
+ |
+
+
+ Aug
+
+ |
+
+
+ Sept
+
+ |
+
+
+ |
+
+ Oct
+
+ |
+
+
+ Nov
+
+ |
+
+
+ Dec
+
+ |
+
+
+
+
+
+
+ done
+ Done
+
+
+
\ No newline at end of file
diff --git a/src/app/components/settings/settings-invoices.factory.js b/src/app/components/settings/settings-invoices.factory.js
index f6846f75..eddbc959 100644
--- a/src/app/components/settings/settings-invoices.factory.js
+++ b/src/app/components/settings/settings-invoices.factory.js
@@ -2,7 +2,7 @@
* Factory to fetch and retrieve invoice settings from database
* @author ndkcha
* @since 0.5.0
- * @version 0.6.1
+ * @version 0.6.4
*/
///
@@ -23,7 +23,9 @@
saveIvDisplaySettings: saveIvDisplaySettings,
saveIvEmailSubject: saveIvEmailSubject,
saveIvAlignMargins : saveIvAlignMargins,
- getIvAlignMargins: getIvAlignMargins
+ getIvAlignMargins: getIvAlignMargins,
+ changeLastJobCardNo: changeLastJobCardNo,
+ changeLastEstimateNo: changeLastEstimateNo
}
return factory;
@@ -158,6 +160,86 @@
tracker.reject(err);
}
}
+
+ function changeLastJobCardNo(jobcardno) {
+ var tracker = $q.defer();
+ $amRoot.isSettingsId().then(getSettingsDoc).catch(failure);
+ return tracker.promise;
+
+ function getSettingsDoc(res) {
+ pdbConfig.get($amRoot.docIds.settings).then(getSettingsObject).catch(writeSettingsObject);
+ }
+
+ function getSettingsObject(res) {
+ if (!res.settings)
+ res.settings = {};
+ if (!res.settings.invoices)
+ res.settings.invoices = {};
+ res.settings.invoices.lastJobCardNo = jobcardno;
+ pdbConfig.save(res).then(success).catch(failure);
+ }
+
+ function writeSettingsObject(err) {
+ var doc = {
+ _id: utils.generateUUID('sttngs'),
+ creator: $amRoot.username,
+ settings: {
+ invoices: {
+ lastJobCardNo: jobcardno
+ }
+ }
+ }
+ pdbConfig.save(doc).then(success).catch(failure);
+ }
+
+ function success(res) {
+ tracker.resolve(res);
+ }
+
+ function failure(err) {
+ tracker.reject(err);
+ }
+ }
+
+ function changeLastEstimateNo(estimateno) {
+ var tracker = $q.defer();
+ $amRoot.isSettingsId().then(getSettingsDoc).catch(failure);
+ return tracker.promise;
+
+ function getSettingsDoc(res) {
+ pdbConfig.get($amRoot.docIds.settings).then(getSettingsObject).catch(writeSettingsObject);
+ }
+
+ function getSettingsObject(res) {
+ if (!res.settings)
+ res.settings = {};
+ if (!res.settings.invoices)
+ res.settings.invoices = {};
+ res.settings.invoices.lastEstimateNo = estimateno;
+ pdbConfig.save(res).then(success).catch(failure);
+ }
+
+ function writeSettingsObject(err) {
+ var doc = {
+ _id: utils.generateUUID('sttngs'),
+ creator: $amRoot.username,
+ settings: {
+ invoices: {
+ lastEstimateNo: estimateno
+ }
+ }
+ }
+ pdbConfig.save(doc).then(success).catch(failure);
+ }
+
+ function success(res) {
+ tracker.resolve(res);
+ }
+
+ function failure(err) {
+ tracker.reject(err);
+ }
+ }
// change last invoice number in database
function changeLastInvoiceNo(invoiceno) {
diff --git a/src/app/components/settings/settings.controller.js b/src/app/components/settings/settings.controller.js
index 850c59be..0377f9f3 100644
--- a/src/app/components/settings/settings.controller.js
+++ b/src/app/components/settings/settings.controller.js
@@ -2,7 +2,7 @@
* Controller for Settings component
* @author ndkcha
* @since 0.4.1
- * @version 0.6.1
+ * @version 0.6.4
*/
///
@@ -11,14 +11,21 @@
angular.module('automintApp')
.controller('amCtrlSettings', SettingsController);
- SettingsController.$inject = ['$rootScope', '$scope', '$state', '$log', 'utils', 'amBackup', 'amLogin', 'amImportdata', 'amIvSettings', 'amSeTaxSettings'];
+ SettingsController.$inject = ['$rootScope', '$scope', '$state', '$log', 'utils', 'amBackup', 'amLogin', 'amImportdata', 'amIvSettings', 'amSeTaxSettings', 'amSettings'];
- function SettingsController($rootScope, $scope, $state, $log, utils, amBackup, amLogin, amImportdata, amIvSettings, amSeTaxSettings) {
+ function SettingsController($rootScope, $scope, $state, $log, utils, amBackup, amLogin, amImportdata, amIvSettings, amSeTaxSettings, amSettings) {
// initialize view model
var vm = this;
// temporary named assignments
- var olino = 0, ivEmailSubject, oIvFacebookLink, oIvInstagramLink, oIvTwitterLink, oPasscode = '1234', oPasscodeEnabled, oIvAlignTop = '', oIvAlignBottom = '', oIvWorkshopName, oIvWorkshopPhone, oIvWorkshopAddress1, oIvWorkshopAddress2, oIvWorkshopCity;
+ var olino = 0,
+ oljbno = 0,
+ oleno = 0,
+ oPasscode = '1234',
+ oPasscodeEnabled,
+ oIvAlignTop = '',
+ oIvAlignBottom = '',
+ ivEmailSubject, oIvFacebookLink, oIvInstagramLink, oIvTwitterLink, oIvWorkshopName, oIvWorkshopPhone, oIvWorkshopAddress1, oIvWorkshopAddress2, oIvWorkshopCity, oDefaultServiceType;
// named assignments to keep track of UI [BEGIN]
// general settings
@@ -28,6 +35,8 @@
};
vm.label_username = 'Enter Username:';
vm.label_password = 'Enter Password:';
+ vm.serviceStateList = ['Job Card', 'Estimate', 'Bill'];
+ vm.serviceState = vm.serviceStateList[2];
// invoice settings
vm.workshop = {
name: '',
@@ -67,6 +76,7 @@
vm.handleUploadedFile = handleUploadedFile;
vm.handleUploadedCoverPic = handleUploadedCoverPic;
vm.handlePasscodeVisibility = handlePasscodeVisibility;
+ vm.saveDefaultServiceType = saveDefaultServiceType;
// invoice settings
vm.changeWorkshopNameLabel = changeWorkshopNameLabel;
vm.changeWorkshopPhoneLabel = changeWorkshopPhoneLabel;
@@ -94,6 +104,15 @@
vm.saveWorkshopAddress1 = saveWorkshopAddress1;
vm.saveWorkshopAddress2 = saveWorkshopAddress2;
vm.saveWorkshopCity = saveWorkshopCity;
+ vm.resetLastEstimateNo = resetLastEstimateNo;
+ vm.OnBlurLastEstimateNo = OnBlurLastEstimateNo;
+ vm.resetLastJobCardNo = resetLastJobCardNo;
+ vm.OnBlurLastJobCardNo = OnBlurLastJobCardNo;
+ vm.autoCapitalizeCity = autoCapitalizeCity;
+ vm.autoCapitalizeAddressLine1 = autoCapitalizeAddressLine1;
+ vm.autoCapitalizeAddressLine2 = autoCapitalizeAddressLine2;
+ vm.autoCapitalizeWorkshopName = autoCapitalizeWorkshopName;
+ vm.autoCapitalizeEmailSubject = autoCapitalizeEmailSubject;
// function maps [END]
// default execution steps [BEGIN]
@@ -107,6 +126,7 @@
// general settings
checkLogin();
getPasscode();
+ getDefaultServiceType();
// invoice settings
getWorkshopDetails();
getInvoiceSettings();
@@ -120,6 +140,95 @@
// function definitions
+ function getDefaultServiceType() {
+ amSettings.getDefaultServiceType().then(success).catch(failure);
+
+ function success(res) {
+ vm.serviceState = res;
+ oDefaultServiceType = res;
+ }
+
+ function failure(err) {
+ vm.serviceState = vm.serviceStateList[2];
+ oDefaultServiceType = vm.serviceStateList[2];
+ }
+ }
+
+ function saveDefaultServiceType() {
+ if (oDefaultServiceType == vm.serviceState)
+ return;
+ amSettings.saveDefaultServiceType(vm.serviceState).then(success).catch(failure);
+
+ function success(res) {
+ if (res.ok) {
+ oDefaultServiceType = vm.serviceState;
+ utils.showSimpleToast('Default Service Type Changed Successfully!');
+ } else
+ failure();
+ }
+
+ function failure(err) {
+ utils.showSimpleToast('Could not set default service type at moment');
+ vm.serviceState = oDefaultServiceType;
+ }
+ }
+
+ function autoCapitalizeEmailSubject() {
+ vm.ivSettings.emailsubject = utils.autoCapitalizeWord(vm.ivSettings.emailsubject);
+ }
+
+ function autoCapitalizeCity() {
+ vm.workshop.city = utils.autoCapitalizeWord(vm.workshop.city);
+ }
+
+ function autoCapitalizeAddressLine2() {
+ vm.workshop.address2 = utils.autoCapitalizeWord(vm.workshop.address2);
+ }
+
+ function autoCapitalizeAddressLine1() {
+ vm.workshop.address1 = utils.autoCapitalizeWord(vm.workshop.address1);
+ }
+
+ function autoCapitalizeWorkshopName() {
+ vm.workshop.name = utils.autoCapitalizeWord(vm.workshop.name);
+ }
+
+ function OnBlurLastJobCardNo() {
+ if (vm.ivSettings.lastJobCardNo == '' || vm.ivSettings.lastJobCardNo == null || vm.ivSettings.lastJobCardNo == undefined)
+ vm.ivSettings.lastJobCardNo = 0;
+ if (vm.ivSettings.lastJobCardNo == oljbno)
+ return;
+ resetLastJobCardNo(vm.ivSettings.lastJobCardNo);
+ }
+
+ function resetLastJobCardNo(jobcardno, reset) {
+ amIvSettings.changeLastJobCardNo((jobcardno == undefined) ? 0 : jobcardno).then(respond).catch(respond);
+
+ function respond(res) {
+ getInvoiceSettings();
+ if (reset != true)
+ utils.showActionToast('Job Card Number has been ' + ((jobcardno == undefined) ? 'reset' : 'changed'), 'Undo', resetLastJobCardNo, oljbno, true);
+ }
+ }
+
+ function OnBlurLastEstimateNo() {
+ if (vm.ivSettings.lastEstimateNo == '' || vm.ivSettings.lastEstimateNo == null || vm.ivSettings.lastEstimateNo == undefined)
+ vm.ivSettings.lastEstimateNo = 0;
+ if (vm.ivSettings.lastEstimateNo == oleno)
+ return;
+ resetLastEstimateNo(vm.ivSettings.lastEstimateNo);
+ }
+
+ function resetLastEstimateNo(estimateno, reset) {
+ amIvSettings.changeLastEstimateNo((estimateno == undefined) ? 0 : estimateno).then(respond).catch(respond);
+
+ function respond(res) {
+ getInvoiceSettings();
+ if (reset != true)
+ utils.showActionToast('Estimate number has been ' + ((estimateno == undefined) ? 'reset' : 'changed'), 'Undo', resetLastEstimateNo, oleno, true);
+ }
+ }
+
function handlePasscodeVisibility(visible) {
document.getElementById('am-passcode').type = (visible) ? 'text' : 'password';
}
@@ -157,7 +266,7 @@
}
function failure(err) {
- console.log(err);
+ console.warn(err);
utils.showSimpleToast('Could not save margin! Please Try Again!');
}
}
@@ -333,7 +442,6 @@
function handleUploadedFile(e) {
vm.currentCsvProgress = 0;
var files = e.target.files || e.originalEvent.dataTransfer.files;
- console.log(files);
amImportdata.compileCSVFile(files).then(displayToastMessage).catch(displayToastMessage).finally(cleanUp, updates);
function displayToastMessage(res) {
@@ -479,7 +587,16 @@
function success(res) {
vm.ivSettings = res;
+ if (!vm.ivSettings.lastJobCardNo)
+ vm.ivSettings.lastJobCardNo = 0;
+ if (!vm.ivSettings.lastEstimateNo)
+ vm.ivSettings.lastEstimateNo = 0;
+ if (!vm.ivSettings.lastInvoiceNumber)
+ vm.ivSettings.lastInvoiceNumber = 0;
+
olino = res.lastInvoiceNumber;
+ oljbno = res.lastJobCardNo;
+ oleno = res.lastEstimateNo;
ivEmailSubject = res.emailsubject;
}
diff --git a/src/app/components/settings/settings.factory.js b/src/app/components/settings/settings.factory.js
new file mode 100644
index 00000000..7f4a0843
--- /dev/null
+++ b/src/app/components/settings/settings.factory.js
@@ -0,0 +1,88 @@
+/**
+ * Factory to fetch and retrieve service tax settings from database
+ * @author ndkcha
+ * @since 0.6.4
+ * @version 0.6.4
+ */
+
+///
+
+(function() {
+ angular.module('automintApp').factory('amSettings', SettingsFactory);
+
+ SettingsFactory.$inject = ['$q', '$amRoot', 'utils', 'pdbConfig'];
+
+ function SettingsFactory($q, $amRoot, utils, pdbConfig) {
+ var factory = {
+ getDefaultServiceType: getDefaultServiceType,
+ saveDefaultServiceType: saveDefaultServiceType
+ }
+
+ return factory;
+
+ // function definitions
+
+ function getDefaultServiceType() {
+ var tracker = $q.defer();
+ $amRoot.isSettingsId().then(getSettingsDoc).catch(failure);
+ return tracker.promise;
+
+ function getSettingsDoc(res) {
+ pdbConfig.get($amRoot.docIds.settings).then(getSettingsObject).catch(failure);
+ }
+
+ function getSettingsObject(res) {
+ if (res.settings && res.settings.servicestate)
+ tracker.resolve(res.settings.servicestate);
+ else
+ failure();
+ }
+
+ function failure(err) {
+ if (!err) {
+ err = {
+ success: false,
+ message: 'Could not find service state'
+ }
+ }
+ tracker.reject(err);
+ }
+ }
+
+ function saveDefaultServiceType(servicestate) {
+ var tracker = $q.defer();
+ $amRoot.isSettingsId().then(getSettingsDoc).catch(failure);
+ return tracker.promise;
+
+ function getSettingsDoc(res) {
+ pdbConfig.get($amRoot.docIds.settings).then(getSettingsObject).catch(writeSettingsObject);
+ }
+
+ function getSettingsObject(res) {
+ if (!res.settings)
+ res.settings = {};
+ res.settings.servicestate = servicestate;
+ pdbConfig.save(res).then(success).catch(failure);
+ }
+
+ function writeSettingsObject(err) {
+ var doc = {
+ _id: utils.generateUUID('sttngs'),
+ creator: $amRoot.username,
+ settings: {
+ servicestate: servicestate
+ }
+ }
+ pdbConfig.save(doc).then(success).catch(failure);
+ }
+
+ function success(res) {
+ tracker.resolve(res);
+ }
+
+ function failure(err) {
+ tracker.reject(err);
+ }
+ }
+ }
+})();
\ No newline at end of file
diff --git a/src/app/components/settings/settings.html b/src/app/components/settings/settings.html
index 2dc53c1a..07cc8577 100644
--- a/src/app/components/settings/settings.html
+++ b/src/app/components/settings/settings.html
@@ -107,13 +107,11 @@
-
-
- Import
- Add customers and their vehicle data (in CSV format).
-
-
+
+ Import
+ Add customers and their vehicle data (in CSV format).
+
Click to upload
@@ -140,18 +138,26 @@
+
+
+
+ Default Service Type
+
+
+ {{state}}
+
+
+
-
-
- Backup Your Data
-
-
- file_download
- Download
-
-
Service Tax
-
-
- Apply Service Tax
-
-
-
-
+
+
+ Apply Service Tax
+
+
Exclusive
@@ -221,16 +226,15 @@
-
-
+
+
VAT
-
-
- Apply VAT
-
-
-
-
+
Exclusive
@@ -252,37 +256,35 @@
-
-
- Workshop Details
-
-
-
-
- domain
-
-
-
-
- phone
-
-
-
-
- location_on
-
-
-
-
- location_on
-
-
-
-
- location_city
-
-
-
+
+ Workshop Details
+
+
+ domain
+
+
+
+
+ phone
+
+
+
+
+ location_on
+
+
+
+
+ location_on
+
+
+
+
+ location_city
+
+
+
+
@@ -291,30 +293,28 @@
-
- Social Links
-
-
- Show Links
-
-
-
-
-
-
- facebook.com/
-
-
-
-
- instagram.com/
-
-
-
-
- twitter.com/
-
-
+
+
+ Social Links
+
+
+ Show Links
+
+
+
+ facebook.com/
+
+
+
+
+ instagram.com/
+
+
+
+
+ twitter.com/
+
@@ -323,15 +323,34 @@
-
+
Last Invoice Number:
-
-
-
-
- Reset
-
-
+
+
+
+
+ Reset
+
+
+
+ Last Estimate Number:
+
+
+
+
+ Reset
+
+
+
+ Last Job Card Number:
+
+
+
+
+ Reset
+
@@ -360,19 +379,19 @@
Email Subject
subject
-
+
-
- Printing Margin (in cm)
-
-
- Enable Margins
-
-
+
+ Printing Margin (in cm)
+
+
+ Enable Margins
+
+ | |