| Name | @@ -22,8 +22,8 @@||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{item.Name}} | {{item.Type}} | {{item.IsActive}} | diff --git a/brewman/static/app/account/account-list.resolver.ts b/brewman/static/app/account/account-list.resolver.ts new file mode 100644 index 00000000..b17bda36 --- /dev/null +++ b/brewman/static/app/account/account-list.resolver.ts @@ -0,0 +1,3 @@ +export function AccountListResolver(Account) { + return Account.query({}).$promise; +} diff --git a/brewman/static/app/account/account-type.service.ts b/brewman/static/app/account/account-type.service.ts new file mode 100644 index 00000000..6a3f37b8 --- /dev/null +++ b/brewman/static/app/account/account-type.service.ts @@ -0,0 +1,3 @@ +export function AccountType($resource) { + return $resource('/api/AccountTypes'); +} diff --git a/brewman/static/app/account/account-types.resolver.ts b/brewman/static/app/account/account-types.resolver.ts new file mode 100644 index 00000000..b3829ac7 --- /dev/null +++ b/brewman/static/app/account/account-types.resolver.ts @@ -0,0 +1,4 @@ +export function AccountTypesResolver(AccountType) { + return AccountType.query({}).$promise; +} + diff --git a/brewman/static/app/account/account.component.ts b/brewman/static/app/account/account.component.ts new file mode 100644 index 00000000..9356eb6a --- /dev/null +++ b/brewman/static/app/account/account.component.ts @@ -0,0 +1,7 @@ +import {AccountController} from './account.controller'; + +export const AccountComponent = { + templateUrl: '/app/account/account-detail.html', + controller: AccountController, + controllerAs: 'vm' +}; \ No newline at end of file diff --git a/brewman/static/app/account/account.controller.js b/brewman/static/app/account/account.controller.js deleted file mode 100644 index 80c94c64..00000000 --- a/brewman/static/app/account/account.controller.js +++ /dev/null @@ -1,64 +0,0 @@ -angular - .module('overlord') - .controller('AccountController', AccountController); - -AccountController.$inject = ['$scope', '$location', '$uibModal', 'account', 'accountTypes', 'costCentres']; -function AccountController($scope, $location, $modal, account, accountTypes, costCentres) { - $scope.account = account; - - $scope.accountTypes = accountTypes; - $scope.costCentres = costCentres; - - $scope.save = function () { - $scope.account.$save(function () { - $scope.toasts.push({Type: 'Success', Message: ''}); - $location.path('/Accounts'); - }, function (data) { - $scope.toasts.push({Type: 'Danger', Message: data.data}); - }); - }; - - $scope.delete = function () { - $scope.account.$delete(function () { - $scope.toasts.push({Type: 'Success', Message: ''}); - $location.path('/Accounts'); - }, function (data) { - $scope.toasts.push({Type: 'Danger', Message: data.data}); - }); - }; - - $scope.confirm = function () { - var modalInstance = $modal.open({ - backdrop: true, - templateUrl: '/template/modal/confirm.html', - controller: ['$scope', '$uibModalInstance', function ($scope, $modalInstance) { - $scope.title = "Delete Account"; - $scope.body = "Are you sure? This cannot be undone."; - $scope.isDelete = true; - $scope.ok = function () { - $modalInstance.close(); - }; - $scope.cancel = function () { - $modalInstance.dismiss('cancel'); - }; - }] - }); - modalInstance.result.then(function () { - $scope.delete(); - }); - }; - $scope.foName = true; -}; - -AccountController.resolve = { - account: ['$route', 'Account', function ($route, Account) { - var id = $route.current.params.id; - return Account.get({id: id}).$promise; - }], - accountTypes: ['AccountType', function (AccountType) { - return AccountType.query({}).$promise; - }], - costCentres: ['CostCentre', function (CostCentre) { - return CostCentre.query({}).$promise; - }] -}; diff --git a/brewman/static/app/account/account.controller.ts b/brewman/static/app/account/account.controller.ts new file mode 100644 index 00000000..64fd5145 --- /dev/null +++ b/brewman/static/app/account/account.controller.ts @@ -0,0 +1,61 @@ +export class AccountController { + static $inject = ['$scope', '$location', '$uibModal', 'Messages']; + foName: any; + account: any; + accountTypes: any; + costCentres: any; + + constructor(public $scope, public $location, public $modal, public Messages) { + this.account = $scope.$parent.res.account; + this.accountTypes = $scope.$parent.res.accountTypes; + this.costCentres = $scope.$parent.res.costCentres; + this.foName = true; + } + + save() { + this.account.$save(() => { + this.Messages.push({Type: 'Success', Message: ''}); + this.$location.path('/Accounts'); + }, (data) => { + this.Messages.push({Type: 'Danger', Message: data.data}); + }); + } + + delete() { + this.account.$delete(() => { + this.Messages.push({Type: 'Success', Message: ''}); + this.$location.path('/Accounts'); + }, (data) => { + this.Messages.push({Type: 'Danger', Message: data.data}); + }); + } + + confirm() { + let modalInstance = this.$modal.open({ + backdrop: true, + templateUrl: '/template/modal/confirm.html', + controller: ['$uibModalInstance', class { + title: any; + body: any; + isDelete: boolean; + + constructor(public $modalInstance) { + this.title = "Delete Account"; + this.body = "Are you sure? This cannot be undone."; + this.isDelete = true; + } + + ok() { + this.$modalInstance.close(); + } + + cancel() { + this.$modalInstance.dismiss('cancel'); + } + }] + }); + modalInstance.result.then(() => { + this.delete(); + }); + } +} diff --git a/brewman/static/app/account/account.resolver.ts b/brewman/static/app/account/account.resolver.ts new file mode 100644 index 00000000..3e486d81 --- /dev/null +++ b/brewman/static/app/account/account.resolver.ts @@ -0,0 +1,4 @@ +export function AccountResolver($route, Account) { + const id = $route.current.params.id; + return Account.get({id: id}).$promise; +} diff --git a/brewman/static/app/account/account.service.ts b/brewman/static/app/account/account.service.ts new file mode 100644 index 00000000..655835e1 --- /dev/null +++ b/brewman/static/app/account/account.service.ts @@ -0,0 +1,8 @@ +export function Account($resource) { + return $resource('/api/Account/:id', + {id: '@LedgerID'}, { + query: {method: 'GET', params: {list: true}, isArray: true}, + autocomplete: {method: 'GET', params: {term: ''}, isArray: true}, + balance: {method: 'GET', params: {b: true, d: ''}} + }); +} diff --git a/brewman/static/app/account/payment-accounts.resolver.ts b/brewman/static/app/account/payment-accounts.resolver.ts new file mode 100644 index 00000000..0927b23a --- /dev/null +++ b/brewman/static/app/account/payment-accounts.resolver.ts @@ -0,0 +1,3 @@ +export function PaymentAccountsResolver(Account) { + return Account.autocomplete({term: '', type: 1}).$promise; +} diff --git a/brewman/static/app/account/receipt-accounts.resolver.ts b/brewman/static/app/account/receipt-accounts.resolver.ts new file mode 100644 index 00000000..27e21657 --- /dev/null +++ b/brewman/static/app/account/receipt-accounts.resolver.ts @@ -0,0 +1,3 @@ +export function ReceiptAccountsResolver(Account) { + return Account.autocomplete({term: '', type: 1}).$promise; +} diff --git a/brewman/static/app/attendance/attendance-info.resolver.ts b/brewman/static/app/attendance/attendance-info.resolver.ts new file mode 100644 index 00000000..0df0d09a --- /dev/null +++ b/brewman/static/app/attendance/attendance-info.resolver.ts @@ -0,0 +1,10 @@ +import * as angular from 'angular'; + +export function AttendanceInfoResolver($route, Attendance) { + const date = $route.current.params.date; + if (angular.isUndefined(date)) { + return Attendance.get({}).$promise; + } else { + return Attendance.get({date: date}).$promise; + } +} diff --git a/brewman/static/app/attendance/attendance-sub.controller.js b/brewman/static/app/attendance/attendance-sub.controller.js deleted file mode 100644 index e7e19981..00000000 --- a/brewman/static/app/attendance/attendance-sub.controller.js +++ /dev/null @@ -1,29 +0,0 @@ -angular - .module('overlord') - .controller('AttendanceSubController', AttendanceSubController); - -AttendanceSubController.$inject = ['$scope']; -function AttendanceSubController($scope) { - $scope.original = {}; - angular.copy($scope.item, $scope.original); - - $scope.isLabel = function () { - return true; - }; - - $scope.isError = function () { - return $scope.item.Worked === 'Error'; - }; - - $scope.isGood = function () { - return $scope.item.Worked === true; - }; - - $scope.isBad = function () { - return $scope.item.Worked === false; - }; - - $scope.isDirty = function () { - return !angular.equals($scope.original, $scope.item); - }; -} diff --git a/brewman/static/app/attendance/attendance-sub.controller.ts b/brewman/static/app/attendance/attendance-sub.controller.ts new file mode 100644 index 00000000..f3aec9a9 --- /dev/null +++ b/brewman/static/app/attendance/attendance-sub.controller.ts @@ -0,0 +1,35 @@ +import * as angular from 'angular'; + +export class AttendanceSubController { + static $inject = ['$scope']; + item: any; + original: any; + attendanceTypes: any; + + constructor(public $scope) { + this.attendanceTypes = $scope.attendanceTypes; + this.item = $scope.item; + this.original = {}; + angular.copy(this.item, this.original); + } + + isLabel() { + return true; + } + + isError() { + return this.item.Worked === 'Error'; + } + + isGood() { + return this.item.Worked === true; + } + + isBad() { + return this.item.Worked === false; + } + + isDirty() { + return !angular.equals(this.original, this.item); + } +} diff --git a/brewman/static/app/attendance/attendance-sub.directive.ts b/brewman/static/app/attendance/attendance-sub.directive.ts new file mode 100644 index 00000000..a0b01bc8 --- /dev/null +++ b/brewman/static/app/attendance/attendance-sub.directive.ts @@ -0,0 +1,14 @@ +import {AttendanceSubController} from './attendance-sub.controller'; + +export function AttendanceSubDirective() { + return { + scope: { + item: '=attendanceSub', + attendanceTypes: '=attendanceTypes' + }, + restrict: 'A', + templateUrl: '/app/attendance/attendance-sub.html', + controller: AttendanceSubController, + controllerAs: 'vmSub', + }; +} diff --git a/brewman/static/app/attendance/attendance-sub.html b/brewman/static/app/attendance/attendance-sub.html new file mode 100644 index 00000000..fda3d8aa --- /dev/null +++ b/brewman/static/app/attendance/attendance-sub.html @@ -0,0 +1,12 @@ +{{item.Code}} | +{{item.Name}} | +{{item.Designation}} | +{{item.Department}} | ++ + | +{{item.Prints}} + {{item.Hours}} + | diff --git a/brewman/static/app/attendance/attendance-types.resolver.ts b/brewman/static/app/attendance/attendance-types.resolver.ts new file mode 100644 index 00000000..3dd4c02d --- /dev/null +++ b/brewman/static/app/attendance/attendance-types.resolver.ts @@ -0,0 +1,3 @@ +export function AttendanceTypesResolver(AttendanceTypes) { + return AttendanceTypes.query({}).$promise; +} diff --git a/brewman/static/app/attendance/attendance-types.service.ts b/brewman/static/app/attendance/attendance-types.service.ts new file mode 100644 index 00000000..f19542fa --- /dev/null +++ b/brewman/static/app/attendance/attendance-types.service.ts @@ -0,0 +1,3 @@ +export function AttendanceTypes($resource) { + return $resource('/api/AttendanceTypes'); +} diff --git a/brewman/static/app/attendance/attendance.component.ts b/brewman/static/app/attendance/attendance.component.ts new file mode 100644 index 00000000..38763032 --- /dev/null +++ b/brewman/static/app/attendance/attendance.component.ts @@ -0,0 +1,7 @@ +import {AttendanceController} from './attendance.controller'; + +export const AttendanceComponent = { + templateUrl: '/app/attendance/attendance.html', + controller: AttendanceController, + controllerAs: 'vm', +}; \ No newline at end of file diff --git a/brewman/static/app/attendance/attendance.controller.js b/brewman/static/app/attendance/attendance.controller.js deleted file mode 100644 index 0c85f383..00000000 --- a/brewman/static/app/attendance/attendance.controller.js +++ /dev/null @@ -1,42 +0,0 @@ -angular - .module('overlord') - .controller('AttendanceController', AttendanceController); - -AttendanceController.$inject = ['$scope', '$location', 'asDateFilter', 'Attendance', 'attendanceTypes', 'info', 'uibDateParser']; -function AttendanceController($scope, $location, asDate, Attendance, attendanceTypes, info, dateParser) { - var _info_Date = dateParser.parse(info.Date, "dd-MMM-yyyy"); - $scope.info_Date = function (value) { - if (arguments.length) { - $scope.info.Date = asDate(value); - _info_Date = value; - } - return _info_Date; - }; - $scope.attendanceTypes = attendanceTypes; - $scope.info = info; - $scope.show = function () { - $location.path('/Attendance/' + $scope.info.Date); - }; - $scope.save = function () { - return $scope.info.$save(function (u) { - $scope.toasts.push({Type: 'Success', Message: u.Code}); - }, function (data) { - $scope.toasts.push({Type: 'Danger', Message: data.data}); - }); - }; - $scope.foDate = true; -} - -tendanceController.resolve = { - info: ['$route', 'Attendance', function ($route, Attendance) { - var date = $route.current.params.date; - if (angular.isUndefined(date)) { - return Attendance.get({}).$promise; - } else { - return Attendance.get({date: date}).$promise; - } - }], - attendanceTypes: ['AttendanceTypes', function (AttendanceTypes) { - return AttendanceTypes.query({}).$promise; - }] -}; \ No newline at end of file diff --git a/brewman/static/app/attendance/attendance.controller.ts b/brewman/static/app/attendance/attendance.controller.ts new file mode 100644 index 00000000..a8ad6525 --- /dev/null +++ b/brewman/static/app/attendance/attendance.controller.ts @@ -0,0 +1,34 @@ +export class AttendanceController { + static $inject = ['$scope', '$location', 'asDateFilter', 'Attendance', 'uibDateParser', 'Messages']; + _info_Date: any; + foDate: boolean; + attendanceTypes: any; + info: any; + + constructor(public $scope, public $location, public asDate, public Attendance, public dateParser, public Messages) { + this.attendanceTypes = $scope.$parent.res.attendanceTypes; + this.info = $scope.$parent.res.info; + this._info_Date = dateParser.parse(this.info.Date, "dd-MMM-yyyy"); + this.foDate = true; + } + + info_Date(value) { + if (arguments.length) { + this.info.Date = this.asDate(value); + this._info_Date = value; + } + return this._info_Date; + } + + show() { + this.$location.path('/Attendance/' + this.info.Date); + } + + save() { + return this.info.$save((u) => { + this.Messages.push({Type: 'Success', Message: u.Code}); + }, (data) => { + this.Messages.push({Type: 'Danger', Message: data.data}); + }); + } +} diff --git a/brewman/static/app/attendance/attendance.html b/brewman/static/app/attendance/attendance.html index f7edc9e0..f720ad92 100644 --- a/brewman/static/app/attendance/attendance.html +++ b/brewman/static/app/attendance/attendance.html @@ -6,9 +6,9 @@||||||
| {{item.Code}} | -{{item.Name}} | -{{item.Designation}} | -{{item.Department}} | -- - | -{{item.Prints}} - {{item.Hours}} - | +
-
+
@@ -15,7 +15,7 @@
-
+
@@ -29,7 +29,7 @@
@@ -17,7 +17,7 @@
@@ -37,48 +37,48 @@
@@ -25,7 +25,7 @@
-
+
-
+
-
+
-
+
-
-
+
+
@@ -15,7 +15,7 @@
-
+
@@ -29,7 +29,7 @@
-
+
-
+
@@ -17,7 +17,7 @@
@@ -25,7 +25,7 @@
-
+
| {{item.Date}} | {{item.Type}} | {{item.Narration}} | diff --git a/brewman/static/app/daybook/daybook.resolver.ts b/brewman/static/app/daybook/daybook.resolver.ts new file mode 100644 index 00000000..dd7a5055 --- /dev/null +++ b/brewman/static/app/daybook/daybook.resolver.ts @@ -0,0 +1,12 @@ +import * as angular from 'angular'; + +export function DaybookResolver($route, Daybook) { + const startDate = $route.current.params.StartDate, + finishDate = $route.current.params.FinishDate; + + if (angular.isUndefined(startDate) || angular.isUndefined(finishDate)) { + return Daybook.get({}).$promise; + } else { + return Daybook.get({StartDate: startDate, FinishDate: finishDate}).$promise; + } +} diff --git a/brewman/static/app/daybook/daybook.service.ts b/brewman/static/app/daybook/daybook.service.ts new file mode 100644 index 00000000..67637ee2 --- /dev/null +++ b/brewman/static/app/daybook/daybook.service.ts @@ -0,0 +1,3 @@ +export function Daybook($resource) { + return $resource('/api/Daybook'); +} diff --git a/brewman/static/app/employee/employee-attendance-info.resolver.ts b/brewman/static/app/employee/employee-attendance-info.resolver.ts new file mode 100644 index 00000000..24327b5c --- /dev/null +++ b/brewman/static/app/employee/employee-attendance-info.resolver.ts @@ -0,0 +1,13 @@ +import * as angular from 'angular'; + +export function EmployeeAttendanceInfoResolver($route, EmployeeAttendance) { + const id = $route.current.params.id, + startDate = $route.current.params.StartDate, + finishDate = $route.current.params.FinishDate; + + if (angular.isUndefined(id)) { + return EmployeeAttendance.get({}).$promise; + } else { + return EmployeeAttendance.get({id: id, StartDate: startDate, FinishDate: finishDate}).$promise; + } +} diff --git a/brewman/static/app/employee/employee-attendance-sub.directive.ts b/brewman/static/app/employee/employee-attendance-sub.directive.ts new file mode 100644 index 00000000..010aa7d5 --- /dev/null +++ b/brewman/static/app/employee/employee-attendance-sub.directive.ts @@ -0,0 +1,14 @@ +import {AttendanceSubController} from "../attendance/attendance-sub.controller"; + +export function EmployeeAttendanceSubDirective() { + return { + scope: { + item: '=employeeAttendanceSub', + attendanceTypes: '=attendanceTypes' + }, + restrict: 'A', + templateUrl: '/app/employee/employee-attendance-sub.html', + controller: AttendanceSubController, + controllerAs: 'vmSub', + }; +} diff --git a/brewman/static/app/employee/employee-attendance-sub.html b/brewman/static/app/employee/employee-attendance-sub.html new file mode 100644 index 00000000..6df01970 --- /dev/null +++ b/brewman/static/app/employee/employee-attendance-sub.html @@ -0,0 +1,12 @@ +{{item.Date}} | ++ + + | +{{item.Prints}} {{item.Hours}} + | ++ + | diff --git a/brewman/static/app/employee/employee-attendance.component.ts b/brewman/static/app/employee/employee-attendance.component.ts new file mode 100644 index 00000000..a0120d77 --- /dev/null +++ b/brewman/static/app/employee/employee-attendance.component.ts @@ -0,0 +1,7 @@ +import {EmployeeAttendanceController} from './employee-attendance.controller'; + +export const EmployeeAttendanceComponent = { + templateUrl: '/app/employee/employee-attendance.html', + controller: EmployeeAttendanceController, + controllerAs: 'vm', +}; \ No newline at end of file diff --git a/brewman/static/app/employee/employee-attendance.controller.js b/brewman/static/app/employee/employee-attendance.controller.js deleted file mode 100644 index 95688e3e..00000000 --- a/brewman/static/app/employee/employee-attendance.controller.js +++ /dev/null @@ -1,100 +0,0 @@ -angular - .module('overlord') - .controller('EmployeeAttendanceController', EmployeeAttendanceController); -EmployeeAttendanceController.$inject = ['$scope', '$location', '$routeParams', 'asDateFilter', 'EmployeeAttendance', 'attendanceTypes', 'info', 'Employee', 'uibDateParser']; -function EmployeeAttendanceController($scope, $location, $routeParams, asDate, EmployeeAttendance, attendanceTypes, info, Employee, dateParser) { - var _info_StartDate = dateParser.parse(info.StartDate, "dd-MMM-yyyy"), - _info_FinishDate = dateParser.parse(info.FinishDate, "dd-MMM-yyyy"); - $scope.info_StartDate = function (value) { - if (arguments.length) { - $scope.info.StartDate = asDate(value); - _info_StartDate = value; - } - return _info_StartDate; - }; - $scope.info_FinishDate = function (value) { - if (arguments.length) { - $scope.info.FinishDate = asDate(value); - _info_FinishDate = value; - } - return _info_FinishDate; - }; - $scope.attendanceTypes = attendanceTypes; - $scope.info = info; - $scope.show = function () { - var id = $scope.info.Employee.LedgerID; - if (id === $routeParams.id && $scope.info.StartDate === $routeParams.StartDate && $scope.info.FinishDate === $routeParams.FinishDate) { - EmployeeAttendance.get({ - id: id, - StartDate: $scope.info.StartDate, - FinishDate: $scope.info.FinishDate - }, function (data) { - $scope.info = data; - }); - } - else { - $location.path('/EmployeeAttendance/' + id).search({ - StartDate: $scope.info.StartDate, - FinishDate: $scope.info.FinishDate - }); - } - }; - - $scope.employees = function ($viewValue) { - return Employee.autocomplete({term: $viewValue, count: 20}).$promise; - }; - - $scope.save = function () { - return $scope.info.$save(function (u, putResponseHeaders) { - $scope.toasts.push({Type: 'Success', Message: 'Saved!'}); - }, function (data, status) { - $scope.toasts.push({Type: 'Danger', Message: data.data}); - }); - }; - $scope.foEmployee = true; -} - -angular - .module('overlord') - .controller('EmployeeAttendanceSubController', EmployeeAttendanceSubController); -EmployeeAttendanceSubController.$inject = ['$scope']; -function EmployeeAttendanceSubController($scope) { - $scope.original = {}; - angular.copy($scope.item, $scope.original); - - $scope.isLabel = function () { - return true; - }; - - $scope.isError = function () { - return $scope.item.Worked === 'Error'; - }; - - $scope.isGood = function () { - return $scope.item.Worked === true; - }; - - $scope.isBad = function () { - return $scope.item.Worked === false; - }; - - $scope.isDirty = function () { - return !angular.equals($scope.original, $scope.item); - }; -} -EmployeeAttendanceController.resolve = { - info: ['$route', 'EmployeeAttendance', function ($route, EmployeeAttendance) { - var id = $route.current.params.id, - startDate = $route.current.params.StartDate, - finishDate = $route.current.params.FinishDate; - - if (angular.isUndefined(id)) { - return EmployeeAttendance.get({}).$promise; - } else { - return EmployeeAttendance.get({id: id, StartDate: startDate, FinishDate: finishDate}).$promise; - } - }], - attendanceTypes: ['AttendanceTypes', function (AttendanceTypes) { - return AttendanceTypes.query({}).$promise; - }] -}; \ No newline at end of file diff --git a/brewman/static/app/employee/employee-attendance.controller.ts b/brewman/static/app/employee/employee-attendance.controller.ts new file mode 100644 index 00000000..0d200ff6 --- /dev/null +++ b/brewman/static/app/employee/employee-attendance.controller.ts @@ -0,0 +1,64 @@ +export class EmployeeAttendanceController { + static $inject = ['$scope', '$location', '$routeParams', 'asDateFilter', 'EmployeeAttendance', 'Employee', 'uibDateParser', 'Messages']; + _info_StartDate: any; + _info_FinishDate: any; + foEmployee: boolean; + item: any; + attendanceTypes: any; + info: any; + + constructor(public $scope, public $location, public $routeParams, public asDate, public EmployeeAttendance, public Employee, public dateParser, public Messages) { + this.attendanceTypes = $scope.$parent.res.attendanceTypes; + this.info = $scope.$parent.res.info; + this._info_StartDate = dateParser.parse(this.info.StartDate, "dd-MMM-yyyy"); + this._info_FinishDate = dateParser.parse(this.info.FinishDate, "dd-MMM-yyyy"); + this.foEmployee = true; + } + + info_StartDate(value) { + if (arguments.length) { + this.info.StartDate = this.asDate(value); + this._info_StartDate = value; + } + return this._info_StartDate; + } + + info_FinishDate(value) { + if (arguments.length) { + this.info.FinishDate = this.asDate(value); + this._info_FinishDate = value; + } + return this._info_FinishDate; + } + + show() { + const id = this.info.Employee.LedgerID; + if (id === this.$routeParams.id && this.info.StartDate === this.$routeParams.StartDate && this.info.FinishDate === this.$routeParams.FinishDate) { + this.EmployeeAttendance.get({ + id: id, + StartDate: this.info.StartDate, + FinishDate: this.info.FinishDate + }, (data) => { + this.info = data; + }); + } + else { + this.$location.path('/EmployeeAttendance/' + id).search({ + StartDate: this.info.StartDate, + FinishDate: this.info.FinishDate + }); + } + } + + employees($viewValue) { + return this.Employee.autocomplete({term: $viewValue, count: 20}).$promise; + } + + save() { + return this.info.$save((u, putResponseHeaders) => { + this.Messages.push({Type: 'Success', Message: 'Saved!'}); + }, (data, status) => { + this.Messages.push({Type: 'Danger', Message: data.data}); + }); + } +} diff --git a/brewman/static/app/employee/employee-attendance.html b/brewman/static/app/employee/employee-attendance.html index abd45571..2c2fadf6 100644 --- a/brewman/static/app/employee/employee-attendance.html +++ b/brewman/static/app/employee/employee-attendance.html @@ -7,7 +7,7 @@
| {{item.Date}} | -- - - | -{{item.Prints}} {{item.Hours}} - | -- - | +|||
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -68,13 +68,13 @@
+
diff --git a/brewman/static/app/employee/employee-functions.component.ts b/brewman/static/app/employee/employee-functions.component.ts
new file mode 100644
index 00000000..7f1b5a8a
--- /dev/null
+++ b/brewman/static/app/employee/employee-functions.component.ts
@@ -0,0 +1,7 @@
+import {EmployeeFunctionsController} from './employee-functions.controller';
+
+export const EmployeeFunctionsComponent = {
+ templateUrl: '/app/employee/employee-functions.html',
+ controller: EmployeeFunctionsController,
+ controllerAs: 'vm',
+};
\ No newline at end of file
diff --git a/brewman/static/app/employee/employee-functions.controller.js b/brewman/static/app/employee/employee-functions.controller.js
deleted file mode 100644
index 51c2feb4..00000000
--- a/brewman/static/app/employee/employee-functions.controller.js
+++ /dev/null
@@ -1,68 +0,0 @@
-angular
- .module('overlord')
- .controller('EmployeeFunctionsController', EmployeeFunctionsController);
-EmployeeFunctionsController.$inject = ['$scope', '$http', 'asDateFilter'];
-function EmployeeFunctionsController($scope, $http, asDate) {
- var _record_StartDate,
- _record_FinishDate;
- $scope.record_StartDate = function (value) {
- if (arguments.length) {
- $scope.record.StartDate = asDate(value);
- _record_StartDate = value;
- }
- return _record_StartDate;
- };
- $scope.record_FinishDate = function (value) {
- if (arguments.length) {
- $scope.record.FinishDate = asDate(value);
- _record_FinishDate = value;
- }
- return _record_FinishDate;
- };
- $scope.record = {};
- $scope.creditSalary = function () {
- if (!angular.isDate($scope.salaryMonth)) {
- return;
- }
- return $http.
- post('/api/CreditSalary', {Month: asDate($scope.salaryMonth)}).
- success(function (data) {
- $scope.toasts.push({Type: 'Success', Message: data.message});
- }).
- error(function (errorMessage) {
- $scope.toasts.push({Type: 'Danger', Message: errorMessage});
- });
- };
-
- $scope.attendanceRecordUrl = function () {
- if (!$scope.record.StartDate || !$scope.record.FinishDate) {
- return;
- }
-
- var url = '/AttendanceReport?StartDate=' + $scope.record.StartDate + "&FinishDate=" + $scope.record.FinishDate;
- return url;
- };
- $scope.setFile = function (element) {
- $scope.uploadedFile = element.files[0];
- };
- $scope.uploadFingerprints = function () {
- if (!$scope.uploadedFile) {
- $scope.toasts.push({Type: 'Danger', Message: 'Please choose a file first!'});
- return;
- }
- var fd = new FormData();
- fd.append("uploadedFile", $scope.uploadedFile);
- return $http
- .post('/api/Fingerprint', fd, {
- headers: {
- 'Content-Type': undefined
- },
- transformRequest: angular.identity
- }).success(function () {
- $scope.toasts.push({Type: 'Success', Message: 'Data uploaded'});
- }).error(function (data) {
- $scope.toasts.push({Type: 'Danger', Message: data});
- });
- };
-}
-
diff --git a/brewman/static/app/employee/employee-functions.controller.ts b/brewman/static/app/employee/employee-functions.controller.ts
new file mode 100644
index 00000000..bf47ce9c
--- /dev/null
+++ b/brewman/static/app/employee/employee-functions.controller.ts
@@ -0,0 +1,74 @@
+import * as angular from 'angular';
+
+export class EmployeeFunctionsController {
+ static $inject = ['$scope', '$http', 'asDateFilter', 'Messages'];
+ _record_StartDate: any;
+ _record_FinishDate: any;
+ record: any;
+ uploadedFile: any;
+ salaryMonth: any;
+
+ constructor(public $scope, public $http, public asDate, public Messages) {
+ this._record_StartDate = undefined;
+ this._record_FinishDate = undefined;
+ this.record = {};
+ }
+
+ record_StartDate(value) {
+ if (arguments.length) {
+ this.record.StartDate = this.asDate(value);
+ this._record_StartDate = value;
+ }
+ return this._record_StartDate;
+ }
+
+ record_FinishDate(value) {
+ if (arguments.length) {
+ this.record.FinishDate = this.asDate(value);
+ this._record_FinishDate = value;
+ }
+ return this._record_FinishDate;
+ }
+
+ creditSalary() {
+ if (!angular.isDate(this.salaryMonth)) {
+ return;
+ }
+ return this.$http.post('/api/CreditSalary', {Month: this.asDate(this.salaryMonth)}).success((data) => {
+ this.Messages.push({Type: 'Success', Message: data.message});
+ }).error((errorMessage) => {
+ this.Messages.push({Type: 'Danger', Message: errorMessage});
+ });
+ }
+
+ attendanceRecordUrl() {
+ if (!this.record.StartDate || !this.record.FinishDate) {
+ return;
+ }
+ return '/AttendanceReport?StartDate=' + this.record.StartDate + "&FinishDate=" + this.record.FinishDate;
+ }
+
+ setFile(element) {
+ this.uploadedFile = element.files[0];
+ }
+
+ uploadFingerprints() {
+ if (!this.uploadedFile) {
+ this.Messages.push({Type: 'Danger', Message: 'Please choose a file first!'});
+ return;
+ }
+ let fd = new FormData();
+ fd.append("uploadedFile", this.uploadedFile);
+ return this.$http
+ .post('/api/Fingerprint', fd, {
+ headers: {
+ 'Content-Type': undefined
+ },
+ transformRequest: angular.identity
+ }).success(() => {
+ this.Messages.push({Type: 'Success', Message: 'Data uploaded'});
+ }).error((data) => {
+ this.Messages.push({Type: 'Danger', Message: data});
+ });
+ }
+}
diff --git a/brewman/static/app/employee/employee-functions.html b/brewman/static/app/employee/employee-functions.html
index 3f9434ab..775bd30e 100644
--- a/brewman/static/app/employee/employee-functions.html
+++ b/brewman/static/app/employee/employee-functions.html
@@ -7,14 +7,14 @@
diff --git a/brewman/static/app/employee/employee-list.component.ts b/brewman/static/app/employee/employee-list.component.ts
new file mode 100644
index 00000000..7734097e
--- /dev/null
+++ b/brewman/static/app/employee/employee-list.component.ts
@@ -0,0 +1,7 @@
+import {EmployeeListController} from './employee-list.controller';
+
+export const EmployeeListComponent = {
+ templateUrl: '/app/employee/employee-list.html',
+ controller: EmployeeListController,
+ controllerAs: 'vm'
+};
diff --git a/brewman/static/app/employee/employee-list.controller.js b/brewman/static/app/employee/employee-list.controller.js
deleted file mode 100644
index 5434ed15..00000000
--- a/brewman/static/app/employee/employee-list.controller.js
+++ /dev/null
@@ -1,83 +0,0 @@
-angular
- .module('overlord')
- .controller('EmployeeListController', EmployeeListController);
-
-EmployeeListController.$inject = ['$scope', '$location', '$routeParams', 'Tokenizer', 'employees'];
-function EmployeeListController($scope, $location, $routeParams, Tokenizer, employees) {
- $scope.search = $routeParams.q || '';
- $scope.info = employees;
-
- $scope.$watch('search', function (newValue, oldValue) {
- $scope.filterEmployees(newValue);
- }, true);
-
- $scope.$on('$destroy', function () {
- Tokenizer.doFilter.cache = {};
- });
-
- $scope.searchInfo = {
- comparator: {
- 'n': {'Col': 'Name', 'Comparator': 'text'},
- 'c': {'Col': 'Code', 'Comparator': 'numeric'},
- 's': {'Col': 'Salary', 'Comparator': 'numeric'},
- 'a': {'Col': 'IsActive', 'Comparator': 'boolean'},
- 'des': {'Col': 'Designation', 'Comparator': 'text'},
- 'dep': {'Col': 'CostCentre', 'Comparator': 'text'}
- },
- def: 'n',
- sorter: {
- 'n': 'Name',
- 'c': 'Code',
- 's': 'Salary',
- 'a': 'IsActive',
- 'des': 'Designation',
- 'dep': 'CostCentre'
- }
- };
- $scope.filterEmployees = _.debounce(function (q) {
- if (q !== $scope._search) {
- $scope._search = q;
- if (angular.isUndefined(q) || q === '') {
- $location.path('/Employees').search('q', null).replace();
- } else {
- $location.path('/Employees').search({'q': q}).replace();
- }
- $scope.$apply(function () {
- var matches = Tokenizer.parseFilterString(q, $scope.searchInfo);
- $scope.employees = Tokenizer.doFilter(q, $scope.info, matches);
-
- });
- }
- }, 350);
-
- $scope.selected = -1;
- $scope.setSelected = function (index) {
- $scope.selected = Math.min(Math.max(0, index), $scope.employees.length - 1);
- };
- $scope.shortcuts = {
- 'up': function (e) {
- if ($scope.selected > 0) {
- $scope.$apply(function () {
- $scope.selected = Math.min(Math.max(0, $scope.selected - 1), $scope.employees.length - 1);
- });
- $("#" + $scope.selected).scrollintoview();
- e.preventDefault();
- }
- },
- 'down': function (e) {
- if ($scope.selected < $scope.employees.length - 1) {
- $scope.$apply(function () {
- $scope.selected = Math.min(Math.max(0, $scope.selected + 1), $scope.employees.length - 1);
- });
- $("#" + $scope.selected).scrollintoview();
- e.preventDefault();
- }
- }
- };
-}
-
-EmployeeListController.resolve = {
- employees: ['Employee', function (Employee) {
- return Employee.query({}).$promise;
- }]
-};
diff --git a/brewman/static/app/employee/employee-list.controller.ts b/brewman/static/app/employee/employee-list.controller.ts
new file mode 100644
index 00000000..ca3e8adb
--- /dev/null
+++ b/brewman/static/app/employee/employee-list.controller.ts
@@ -0,0 +1,88 @@
+import * as angular from 'angular';
+import * as _ from 'lodash';
+import * as $ from 'jquery';
+
+export class EmployeeListController {
+ static $inject = ['$scope', '$location', '$routeParams', 'Tokenizer'];
+ search: any;
+ info: any;
+ searchInfo: any;
+ filterEmployees: any;
+ selected: any;
+ shortcuts: any;
+ employees: any;
+
+ constructor(public $scope, public $location, public $routeParams, public Tokenizer) {
+ this.employees = $scope.$parent.res.employees;
+ this.search = $routeParams.q || '';
+ this.info = this.employees;
+ $scope.$watch('vm.search', (newValue, oldValue) => {
+ this.filterEmployees(newValue);
+ }, true);
+
+ $scope.$on('$destroy', () => {
+ Tokenizer.doFilter.cache = {};
+ });
+
+ this.searchInfo = {
+ comparator: {
+ 'n': {'Col': 'Name', 'Comparator': 'text'},
+ 'c': {'Col': 'Code', 'Comparator': 'numeric'},
+ 's': {'Col': 'Salary', 'Comparator': 'numeric'},
+ 'a': {'Col': 'IsActive', 'Comparator': 'boolean'},
+ 'des': {'Col': 'Designation', 'Comparator': 'text'},
+ 'dep': {'Col': 'CostCentre', 'Comparator': 'text'}
+ },
+ def: 'n',
+ sorter: {
+ 'n': 'Name',
+ 'c': 'Code',
+ 's': 'Salary',
+ 'a': 'IsActive',
+ 'des': 'Designation',
+ 'dep': 'CostCentre'
+ }
+ };
+ this.filterEmployees = _.debounce((q) => {
+ if (q !== $scope._search) {
+ $scope._search = q;
+ if (angular.isUndefined(q) || q === '') {
+ this.$location.path('/Employees').search('q', null).replace();
+ } else {
+ this.$location.path('/Employees').search({'q': q}).replace();
+ }
+ $scope.$apply(() => {
+ const matches = Tokenizer.parseFilterString(q, this.searchInfo);
+ this.employees = Tokenizer.doFilter(q, this.info, matches);
+
+ });
+ }
+ }, 350);
+
+ this.selected = -1;
+ this.shortcuts = {
+ 'up': (e) => {
+ if (this.selected > 0) {
+ $scope.$apply(() => {
+ this.selected = Math.min(Math.max(0, this.selected - 1), this.employees.length - 1);
+ });
+ $("#" + this.selected).scrollintoview();
+ e.preventDefault();
+ }
+ },
+ 'down': (e) => {
+ if (this.selected < this.employees.length - 1) {
+ $scope.$apply(() => {
+ this.selected = Math.min(Math.max(0, this.selected + 1), this.employees.length - 1);
+ });
+ $("#" + this.selected).scrollintoview();
+ e.preventDefault();
+ }
+ }
+ };
+ }
+
+ setSelected(index) {
+ this.selected = Math.min(Math.max(0, index), this.employees.length - 1);
+ }
+}
diff --git a/brewman/static/app/employee/employee-list.html b/brewman/static/app/employee/employee-list.html
index 69b01dcb..356f574b 100644
--- a/brewman/static/app/employee/employee-list.html
+++ b/brewman/static/app/employee/employee-list.html
@@ -1,7 +1,7 @@
Employees
@@ -84,8 +84,8 @@
-
-
+
+
+ datepicker-mode="month" is-open="vm.smdOpen" ng-focus="vm.smdOpen = true" ng-model="vm.salaryMonth"/>
-
@@ -27,7 +27,7 @@
@@ -37,7 +37,7 @@
@@ -61,7 +61,7 @@
onchange="angular.element(this).scope().setFile(this)"/>
@@ -45,7 +45,7 @@
-
Employees
-
+
-
+
Code
@@ -23,8 +23,8 @@
-
+
{{item.Code}}
{{item.Name}}
{{item.Designation}}
diff --git a/brewman/static/app/employee/employee-list.resolver.ts b/brewman/static/app/employee/employee-list.resolver.ts
new file mode 100644
index 00000000..634a621e
--- /dev/null
+++ b/brewman/static/app/employee/employee-list.resolver.ts
@@ -0,0 +1,3 @@
+export function EmployeeListResolver(Employee) {
+ return Employee.query({}).$promise;
+}
diff --git a/brewman/static/app/employee/employee.component.ts b/brewman/static/app/employee/employee.component.ts
new file mode 100644
index 00000000..d5c3fbdf
--- /dev/null
+++ b/brewman/static/app/employee/employee.component.ts
@@ -0,0 +1,7 @@
+import {EmployeeController} from './employee.controller';
+
+export const EmployeeComponent = {
+ templateUrl: '/app/employee/employee-detail.html',
+ controller: EmployeeController,
+ controllerAs: 'vm'
+};
\ No newline at end of file
diff --git a/brewman/static/app/employee/employee.controller.js b/brewman/static/app/employee/employee.controller.js
deleted file mode 100644
index f8388be1..00000000
--- a/brewman/static/app/employee/employee.controller.js
+++ /dev/null
@@ -1,75 +0,0 @@
-angular
- .module('overlord')
- .controller('EmployeeController', EmployeeController);
-EmployeeController.$inject = ['$scope', '$routeParams', '$location', 'asDateFilter', '$uibModal', 'employee', 'costCentres', 'uibDateParser'];
-function EmployeeController($scope, $routeParams, $location, asDate, $modal, employee, costCentres, dateParser) {
- var _employee_JoiningDate = dateParser.parse(employee.JoiningDate, "dd-MMM-yyyy"),
- _employee_LeavingDate = dateParser.parse(employee.LeavingDate, "dd-MMM-yyyy");
- $scope.employee_JoiningDate = function (value) {
- if (arguments.length) {
- $scope.employee.JoiningDate = asDate(value);
- _employee_JoiningDate = value;
- }
- return _employee_JoiningDate;
- };
- $scope.employee_LeavingDate = function (value) {
- if (arguments.length) {
- $scope.employee.LeavingDate = asDate(value);
- _employee_LeavingDate = value;
- }
- return _employee_LeavingDate;
- };
- $scope.employee = employee;
-
- $scope.costCentres = costCentres;
-
- $scope.save = function () {
- $scope.employee.$save(function (u, putResponseHeaders) {
- $scope.toasts.push({Type: 'Success', Message: u.Code});
- $location.path('/Employees');
- }, function (data, status) {
- $scope.toasts.push({Type: 'Danger', Message: data.data});
- });
- };
-
- $scope.delete = function () {
- $scope.employee.$delete(function (u, putResponseHeaders) {
- $scope.toasts.push({Type: 'Success', Message: ''});
- $location.path('/Employees');
- }, function (data, status) {
- $scope.toasts.push({Type: 'Danger', Message: data.data});
- });
- };
-
- $scope.confirm = function () {
- var modalInstance = $modal.open({
- backdrop: true,
- templateUrl: '/template/modal/confirm.html',
- controller: ['$scope', '$uibModalInstance', function ($scope, $modalInstance) {
- $scope.title = "Delete Employee";
- $scope.body = "Are you sure? This cannot be undone.";
- $scope.isDelete = true;
- $scope.ok = function () {
- $modalInstance.close();
- };
- $scope.cancel = function () {
- $modalInstance.dismiss('cancel');
- };
- }]
- });
- modalInstance.result.then(function () {
- $scope.delete();
- });
- };
- $scope.foName = true;
-}
-
-EmployeeController.resolve = {
- employee: ['$route', 'Employee', function ($route, Employee) {
- var id = $route.current.params.id;
- return Employee.get({id: id}).$promise;
- }],
- costCentres: ['CostCentre', function (CostCentre) {
- return CostCentre.query({}).$promise;
- }]
-};
diff --git a/brewman/static/app/employee/employee.controller.ts b/brewman/static/app/employee/employee.controller.ts
new file mode 100644
index 00000000..19d53545
--- /dev/null
+++ b/brewman/static/app/employee/employee.controller.ts
@@ -0,0 +1,79 @@
+export class EmployeeController {
+ static $inject = ['$scope', '$routeParams', '$location', 'asDateFilter', '$uibModal', 'uibDateParser', 'Messages'];
+ _employee_JoiningDate: any;
+ _employee_LeavingDate: any;
+ foName: boolean;
+ employee: any;
+ costCentres: any;
+
+ constructor(public $scope, public $routeParams, public $location, public asDate, public $modal, public dateParser, public Messages) {
+ this.employee = $scope.$parent.res.employee;
+ this.costCentres = $scope.$parent.res.costCentres;
+ this._employee_JoiningDate = dateParser.parse(this.employee.JoiningDate, "dd-MMM-yyyy");
+ this._employee_LeavingDate = dateParser.parse(this.employee.LeavingDate, "dd-MMM-yyyy");
+ this.foName = true;
+ }
+
+ employee_JoiningDate(value) {
+ if (arguments.length) {
+ this.employee.JoiningDate = this.asDate(value);
+ this._employee_JoiningDate = value;
+ }
+ return this._employee_JoiningDate;
+ }
+
+ employee_LeavingDate(value) {
+ if (arguments.length) {
+ this.employee.LeavingDate = this.asDate(value);
+ this._employee_LeavingDate = value;
+ }
+ return this._employee_LeavingDate;
+ }
+
+ save() {
+ this.employee.$save((u, putResponseHeaders) => {
+ this.Messages.push({Type: 'Success', Message: u.Code});
+ this.$location.path('/Employees');
+ }, (data, status) => {
+ this.Messages.push({Type: 'Danger', Message: data.data});
+ });
+ }
+
+ delete() {
+ this.employee.$delete((u, putResponseHeaders) => {
+ this.Messages.push({Type: 'Success', Message: ''});
+ this.$location.path('/Employees');
+ }, (data, status) => {
+ this.Messages.push({Type: 'Danger', Message: data.data});
+ });
+ }
+
+ confirm() {
+ const modalInstance = this.$modal.open({
+ backdrop: true,
+ templateUrl: '/template/modal/confirm.html',
+ controller: ['$uibModalInstance', class {
+ title: any;
+ body: any;
+ isDelete: boolean;
+
+ constructor(public $modalInstance) {
+ this.title = "Delete Employee";
+ this.body = "Are you sure? This cannot be undone.";
+ this.isDelete = true;
+ }
+
+ ok() {
+ this.$modalInstance.close();
+ }
+
+ cancel() {
+ this.$modalInstance.dismiss('cancel');
+ }
+ }]
+ });
+ modalInstance.result.then(() => {
+ this.delete();
+ });
+ }
+}
diff --git a/brewman/static/app/employee/employee.resolver.ts b/brewman/static/app/employee/employee.resolver.ts
new file mode 100644
index 00000000..f4c03377
--- /dev/null
+++ b/brewman/static/app/employee/employee.resolver.ts
@@ -0,0 +1,4 @@
+export function EmployeeResolver($route, Employee) {
+ const id = $route.current.params.id;
+ return Employee.get({id: id}).$promise;
+}
diff --git a/brewman/static/app/employee/employee.service.ts b/brewman/static/app/employee/employee.service.ts
new file mode 100644
index 00000000..f52a9045
--- /dev/null
+++ b/brewman/static/app/employee/employee.service.ts
@@ -0,0 +1,7 @@
+export function Employee($resource) {
+ return $resource('/api/Employee/:id',
+ {id: '@LedgerID'}, {
+ query: {method: 'GET', params: {list: true}, isArray: true},
+ autocomplete: {method: 'GET', params: {term: ''}, isArray: true}
+ });
+}
diff --git a/brewman/static/app/group/group-detail.html b/brewman/static/app/group/group-detail.html
index 52029164..e0480d4b 100644
--- a/brewman/static/app/group/group-detail.html
+++ b/brewman/static/app/group/group-detail.html
@@ -5,24 +5,24 @@
-
+
-
+
-
+
-
+
diff --git a/brewman/static/app/group/group-list.component.ts b/brewman/static/app/group/group-list.component.ts
new file mode 100644
index 00000000..4f490b0b
--- /dev/null
+++ b/brewman/static/app/group/group-list.component.ts
@@ -0,0 +1,7 @@
+import {GroupListController} from './group-list.controller';
+
+export const GroupListComponent = {
+ templateUrl: '/app/group/group-list.html',
+ controller: GroupListController,
+ controllerAs: 'vm'
+};
diff --git a/brewman/static/app/group/group-list.controller.js b/brewman/static/app/group/group-list.controller.js
deleted file mode 100644
index c1683616..00000000
--- a/brewman/static/app/group/group-list.controller.js
+++ /dev/null
@@ -1,13 +0,0 @@
-angular
- .module('overlord')
- .controller('GroupListController', GroupListController);
-GroupListController.$inject = ['$scope', 'groups'];
-function GroupListController($scope, groups) {
- $scope.info = groups;
-}
-
-GroupListController.resolve = {
- groups: ['Group', function (Group) {
- return Group.query({}).$promise;
- }]
-};
diff --git a/brewman/static/app/group/group-list.controller.ts b/brewman/static/app/group/group-list.controller.ts
new file mode 100644
index 00000000..5802364b
--- /dev/null
+++ b/brewman/static/app/group/group-list.controller.ts
@@ -0,0 +1,12 @@
+import * as angular from 'angular';
+
+export class GroupListController {
+ static $inject = ['$scope'];
+ info:any;
+ groups: any;
+
+ constructor(public $scope) {
+ this.groups = $scope.$parent.res.groups;
+ this.info = this.groups;
+ }
+}
diff --git a/brewman/static/app/group/group-list.html b/brewman/static/app/group/group-list.html
index 3bfb045a..183311fb 100644
--- a/brewman/static/app/group/group-list.html
+++ b/brewman/static/app/group/group-list.html
@@ -7,7 +7,7 @@
-
+
{{item.Name}}
diff --git a/brewman/static/app/group/group-list.resolver.ts b/brewman/static/app/group/group-list.resolver.ts
new file mode 100644
index 00000000..4e5ed5e9
--- /dev/null
+++ b/brewman/static/app/group/group-list.resolver.ts
@@ -0,0 +1,3 @@
+export function GroupListResolver(Group) {
+ return Group.query({}).$promise;
+}
diff --git a/brewman/static/app/group/group.component.ts b/brewman/static/app/group/group.component.ts
new file mode 100644
index 00000000..84e1ec83
--- /dev/null
+++ b/brewman/static/app/group/group.component.ts
@@ -0,0 +1,7 @@
+import {GroupController} from './group.controller';
+
+export const GroupComponent = {
+ templateUrl: '/app/group/group-detail.html',
+ controller: GroupController,
+ controllerAs: 'vm'
+};
\ No newline at end of file
diff --git a/brewman/static/app/group/group.controller.js b/brewman/static/app/group/group.controller.js
deleted file mode 100644
index 0ee2cb10..00000000
--- a/brewman/static/app/group/group.controller.js
+++ /dev/null
@@ -1,33 +0,0 @@
-angular
- .module('overlord')
- .controller('GroupController', GroupController);
-GroupController.$inject = ['$scope', '$location', 'group'];
-function GroupController($scope, $location, group) {
- $scope.group = group;
-
- $scope.save = function () {
- $scope.group.$save(function (u, putResponseHeaders) {
- $scope.toasts.push({Type: 'Success', Message: ''});
- $location.path('/Groups')
- }, function (data, status) {
- $scope.toasts.push({Type: 'Danger', Message: data.data});
- });
- };
-
- $scope.delete = function () {
- $scope.group.$delete(function (u, putResponseHeaders) {
- $scope.toasts.push({Type: 'Success', Message: ''});
- $location.path('/Groups')
- }, function (data, status) {
- $scope.toasts.push({Type: 'Danger', Message: data.data});
- });
- };
- $scope.foName = true;
-}
-
-GroupController.resolve = {
- group: ['$route', 'Group', function ($route, Group) {
- var id = $route.current.params.id;
- return Group.get({id: id}).$promise;
- }]
-};
diff --git a/brewman/static/app/group/group.controller.ts b/brewman/static/app/group/group.controller.ts
new file mode 100644
index 00000000..f36bf55a
--- /dev/null
+++ b/brewman/static/app/group/group.controller.ts
@@ -0,0 +1,28 @@
+export class GroupController {
+ static $inject = ['$scope', '$location', 'Messages'];
+ foName: boolean;
+ group: any;
+
+ constructor(public $scope, public $location, public Messages) {
+ this.group = $scope.$parent.res.group;
+ this.foName = true;
+ }
+
+ save() {
+ this.group.$save((u, putResponseHeaders) => {
+ this.Messages.push({Type: 'Success', Message: ''});
+ this.$location.path('/Groups')
+ }, (data, status) => {
+ this.Messages.push({Type: 'Danger', Message: data.data});
+ });
+ }
+
+ delete() {
+ this.group.$delete((u, putResponseHeaders) => {
+ this.Messages.push({Type: 'Success', Message: ''});
+ this.$location.path('/Groups')
+ }, (data, status) => {
+ this.Messages.push({Type: 'Danger', Message: data.data});
+ });
+ }
+}
diff --git a/brewman/static/app/group/group.resolver.ts b/brewman/static/app/group/group.resolver.ts
new file mode 100644
index 00000000..771a50df
--- /dev/null
+++ b/brewman/static/app/group/group.resolver.ts
@@ -0,0 +1,4 @@
+export function GroupResolver($route, Group) {
+ const id = $route.current.params.id;
+ return Group.get({id: id}).$promise;
+}
diff --git a/brewman/static/app/group/group.service.ts b/brewman/static/app/group/group.service.ts
new file mode 100644
index 00000000..bd3fac45
--- /dev/null
+++ b/brewman/static/app/group/group.service.ts
@@ -0,0 +1,6 @@
+export function Group($resource) {
+ return $resource('/api/Group/:id',
+ {id: '@GroupID'}, {
+ query: {method: 'GET', params: {list: true}, isArray: true}
+ });
+}
diff --git a/brewman/static/app/home.controller.js b/brewman/static/app/home.controller.js
deleted file mode 100644
index b40a64a5..00000000
--- a/brewman/static/app/home.controller.js
+++ /dev/null
@@ -1,7 +0,0 @@
-angular
- .module('overlord')
- .controller('HomeController', HomeController);
-HomeController.$inject = ['$location'];
-function HomeController($location) {
-}
-HomeController.resolve = {};
\ No newline at end of file
diff --git a/brewman/static/app/home/home.component.ts b/brewman/static/app/home/home.component.ts
new file mode 100644
index 00000000..dd9bd33b
--- /dev/null
+++ b/brewman/static/app/home/home.component.ts
@@ -0,0 +1,7 @@
+import {HomeController} from "./home.controller";
+
+export const HomeComponent = {
+ templateUrl: '/app/home/home.html',
+ controller: HomeController,
+ controllerAs: 'vm',
+};
\ No newline at end of file
diff --git a/brewman/static/app/home/home.controller.ts b/brewman/static/app/home/home.controller.ts
new file mode 100644
index 00000000..e7f2dc3c
--- /dev/null
+++ b/brewman/static/app/home/home.controller.ts
@@ -0,0 +1,6 @@
+export class HomeController {
+ static $inject = ['$location'];
+
+ constructor(public $location) {
+ }
+}
diff --git a/brewman/static/app/home.html b/brewman/static/app/home/home.html
similarity index 100%
rename from brewman/static/app/home.html
rename to brewman/static/app/home/home.html
diff --git a/brewman/static/app/incentive/incentive-voucher.resolver.ts b/brewman/static/app/incentive/incentive-voucher.resolver.ts
new file mode 100644
index 00000000..c116f0d7
--- /dev/null
+++ b/brewman/static/app/incentive/incentive-voucher.resolver.ts
@@ -0,0 +1,11 @@
+import * as angular from 'angular';
+
+export function IncentiveVoucherResolver($route, Voucher) {
+ const id = $route.current.params.id;
+
+ if (angular.isUndefined(id)) {
+ return Voucher.get({type: 'Service Charge'}).$promise;
+ } else {
+ return Voucher.get({id: id}).$promise;
+ }
+}
diff --git a/brewman/static/app/incentive/incentive.component.ts b/brewman/static/app/incentive/incentive.component.ts
new file mode 100644
index 00000000..6f4e71d9
--- /dev/null
+++ b/brewman/static/app/incentive/incentive.component.ts
@@ -0,0 +1,7 @@
+import {IncentiveController} from "./incentive.controller";
+
+export const IncentiveComponent = {
+ templateUrl: '/app/incentive/incentive.html',
+ controller: IncentiveController,
+ controllerAs: 'vm',
+};
\ No newline at end of file
diff --git a/brewman/static/app/incentive/incentive.controller.ts b/brewman/static/app/incentive/incentive.controller.ts
new file mode 100644
index 00000000..4a2aa80f
--- /dev/null
+++ b/brewman/static/app/incentive/incentive.controller.ts
@@ -0,0 +1,126 @@
+import * as angular from 'angular';
+import * as _ from 'lodash';
+
+export class IncentiveController {
+ static $inject = ['$scope', '$location', '$routeParams', 'numberFilter', 'asDateFilter', '$uibModal', 'uibDateParser', 'Messages', 'Credentials'];
+ _voucher_Date: any;
+ voucher: any;
+
+ constructor(public $scope, public $location, public $routeParams, public numberFilter, public asDate, public $modal, public dateParser, public Messages, public Credentials) {
+ this.voucher = $scope.$parent.res.voucher;
+ this._voucher_Date = dateParser.parse(this.voucher.Date, "dd-MMM-yyyy");
+
+ $scope.$watch('vm.voucher.Date', (newDate, oldDate) => {
+ const nDate = asDate(newDate),
+ oDate = asDate(oldDate);
+ if (nDate !== oDate && !angular.isUndefined(nDate)) {
+ if (angular.isUndefined($routeParams.id)) {
+ return this.voucher.$get({type: 'Service Charge', Date: nDate}).$promise;
+ }
+ }
+ }, true);
+ }
+
+ voucher_Date(value) {
+ if (arguments.length) {
+ this.voucher.Date = this.asDate(value);
+ this._voucher_Date = value;
+ }
+ return this._voucher_Date;
+ }
+
+ TotalPoints() {
+ return _(this.voucher.ServiceCharges).map(function (item) {
+ return item.DaysWorked * Number(item.Points);
+ }).reduce(function (sum, item) {
+ return sum + item;
+ });
+ }
+
+ PointValue() {
+ return Math.round(this.voucher.ServiceCharge * 100 / this.TotalPoints()) / 100;
+ }
+
+ less(employee) {
+ if (employee.Points >= 1) {
+ employee.Points -= 1;
+ }
+ }
+
+ more(employee) {
+ employee.Points += 1;
+ }
+
+ employeeAmount(employee) {
+ return Number(employee.Points) * employee.DaysWorked * this.PointValue();
+ }
+
+ preventAlteration(voucher) {
+ if (angular.isUndefined(this.Credentials.Perms)) {
+ return false;
+ } else if (angular.isUndefined(voucher.VoucherID)) {
+ return !this.Credentials.Perms['Service Charge'];
+ } else if (voucher.Posted && !this.Credentials.Perms['Edit Posted Vouchers']) {
+ return true;
+ } else if (voucher.User.UserID !== this.Credentials.Auth.UserID && !this.Credentials.Perms["Edit Other User's Vouchers"]) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ save() {
+ this.voucher.$save({type: 'Service Charge'}, (u) => {
+ this.Messages.push({Type: 'Success', Message: ''});
+ this.$location.path('/ServiceCharge/' + u.VoucherID);
+ }, (data) => {
+ this.Messages.push({Type: 'Danger', Message: data.data});
+ });
+ }
+
+ delete() {
+ this.voucher.$delete(() => {
+ this.Messages.push({Type: 'Success', Message: ''});
+ this.$location.path('/ServiceCharge').replace();
+ }, (data) => {
+ this.Messages.push({Type: 'Danger', Message: data.data});
+ });
+ }
+
+ post() {
+ this.voucher.$post((u, putResponseHeaders) => {
+ this.Messages.push({Type: 'Success', Message: ''});
+ }, (data, status) => {
+ this.Messages.push({Type: 'Danger', Message: data.data});
+ });
+ }
+
+ confirm() {
+ const modalInstance = this.$modal.open({
+ backdrop: true,
+ templateUrl: '/template/modal/confirm.html',
+ controller: ['$uibModalInstance', class {
+ title: any;
+ body: any;
+ isDelete: boolean;
+
+ constructor(public $modalInstance) {
+ this.title = "Delete Voucher";
+ this.body = "Are you sure? This cannot be undone.";
+ this.isDelete = true;
+ }
+
+ ok() {
+ this.$modalInstance.close();
+ }
+
+ cancel() {
+ this.$modalInstance.dismiss('cancel');
+ }
+ }]
+ });
+ modalInstance.result.then(() => {
+ this.delete();
+ });
+ }
+}
diff --git a/brewman/static/app/employee/employee-service-charge.html b/brewman/static/app/incentive/incentive.html
similarity index 60%
rename from brewman/static/app/employee/employee-service-charge.html
rename to brewman/static/app/incentive/incentive.html
index 55510355..5e4d538a 100644
--- a/brewman/static/app/employee/employee-service-charge.html
+++ b/brewman/static/app/incentive/incentive.html
@@ -7,7 +7,7 @@
@@ -19,9 +19,9 @@
- Total Service Charge: {{voucher.ServiceCharge | number:2}}
- Total Points: {{TotalPoints() | number:2}}
- Point Value: {{PointValue() | number:2}}
+ Total Service Charge: {{vm.voucher.ServiceCharge | number:2}}
+ Total Points: {{vm.TotalPoints() | number:2}}
+ Point Value: {{vm.PointValue() | number:2}}
@@ -36,7 +36,7 @@
-
+
{{serviceCharge.Name}}
{{serviceCharge.Designation}}
{{serviceCharge.Department}}
@@ -44,36 +44,36 @@
-
-
- {{employeeAmount(serviceCharge) | number:0}}
+ {{vm.employeeAmount(serviceCharge) | number:0}}
-
- Created on {{voucher.CreationDate | localTime}} and Last Edited on {{voucher.LastEditDate | localTime}}
- by {{voucher.User.Name}}. Posted by {{voucher.Poster}}
+ Created on {{vm.voucher.CreationDate | localTime}} and Last Edited on {{vm.voucher.LastEditDate | localTime}}
+ by {{vm.voucher.User.Name}}. Posted by {{vm.voucher.Poster}}
diff --git a/brewman/static/app/issue/batch.service.ts b/brewman/static/app/issue/batch.service.ts
new file mode 100644
index 00000000..28a744aa
--- /dev/null
+++ b/brewman/static/app/issue/batch.service.ts
@@ -0,0 +1,5 @@
+export function Batch ($resource) {
+ return $resource('/api/Batch', {}, {
+ autocomplete: {method: 'GET', params: {term: ''}, isArray: true}
+ });
+}
diff --git a/brewman/static/app/issue/issue-grid.resolver.ts b/brewman/static/app/issue/issue-grid.resolver.ts
new file mode 100644
index 00000000..22de84a5
--- /dev/null
+++ b/brewman/static/app/issue/issue-grid.resolver.ts
@@ -0,0 +1,15 @@
+import * as angular from 'angular';
+
+export function IssueGridResolver($route, IssueGrid) {
+ const id = $route.current.params.id,
+ source = $route.current.params.Source,
+ destination = $route.current.params.Destination;
+
+ if (!angular.isUndefined(source) && !angular.isUndefined(destination) && !angular.isUndefined(id)) {
+ return IssueGrid.query({date: id, Source: source, Destination: destination}).$promise;
+ } else if (angular.isUndefined(source) && angular.isUndefined(destination) && !angular.isUndefined(id)) {
+ return IssueGrid.query({date: id}).$promise;
+ } else {
+ return {};
+ }
+}
diff --git a/brewman/static/app/issue/issue-grid.service.ts b/brewman/static/app/issue/issue-grid.service.ts
new file mode 100644
index 00000000..a9aa9984
--- /dev/null
+++ b/brewman/static/app/issue/issue-grid.service.ts
@@ -0,0 +1,3 @@
+export function IssueGrid($resource) {
+ return $resource('/api/Issues/Services/:date');
+}
diff --git a/brewman/static/app/issue/issue-modal.controller.js b/brewman/static/app/issue/issue-modal.controller.js
deleted file mode 100644
index 56b3be64..00000000
--- a/brewman/static/app/issue/issue-modal.controller.js
+++ /dev/null
@@ -1,22 +0,0 @@
-angular
- .module('overlord')
- .controller('IssueModalController', IssueModalController);
-IssueModalController.$inject = ['$scope', '$uibModalInstance', 'edit', 'Batch'];
-function IssueModalController($scope, $modalInstance, edit, Batch) {
- $scope.edit = edit;
- $scope.ok = function () {
- $scope.edit.Product = $scope.edit.Batch.Product;
- $scope.edit.Quantity = Number($scope.edit.Quantity);
- $scope.edit.Tax = $scope.edit.Batch.Tax;
- $scope.edit.Discount = $scope.edit.Batch.Discount;
- $scope.edit.Rate = $scope.edit.Batch.Rate;
- $scope.edit.Amount = $scope.edit.Quantity * $scope.edit.Rate * (1 + $scope.edit.Tax) * (1 - $scope.edit.Discount);
- $modalInstance.close($scope.edit);
- };
- $scope.cancel = function () {
- $modalInstance.dismiss('cancel');
- };
- $scope.batches = function ($viewValue) {
- return Batch.autocomplete({term: $viewValue, count: 20}).$promise;
- };
-}
diff --git a/brewman/static/app/issue/issue-modal.controller.ts b/brewman/static/app/issue/issue-modal.controller.ts
new file mode 100644
index 00000000..19c7e244
--- /dev/null
+++ b/brewman/static/app/issue/issue-modal.controller.ts
@@ -0,0 +1,26 @@
+export class IssueModalController {
+ static $inject = ['$scope', '$uibModalInstance', 'Batch'];
+ edit:any;
+
+ constructor(public $scope, public $modalInstance, public Batch) {
+ this.edit = $scope.$resolve.edit;
+ }
+
+ ok() {
+ this.edit.Product = this.edit.Batch.Product;
+ this.edit.Quantity = Number(this.edit.Quantity);
+ this.edit.Tax = this.edit.Batch.Tax;
+ this.edit.Discount = this.edit.Batch.Discount;
+ this.edit.Rate = this.edit.Batch.Rate;
+ this.edit.Amount = this.edit.Quantity * this.edit.Rate * (1 + this.edit.Tax) * (1 - this.edit.Discount);
+ this.$modalInstance.close(this.edit);
+ }
+
+ cancel() {
+ this.$modalInstance.dismiss('cancel');
+ }
+
+ batches($viewValue) {
+ return this.Batch.autocomplete({term: $viewValue, count: 20}).$promise;
+ }
+}
diff --git a/brewman/static/app/issue/issue-modal.html b/brewman/static/app/issue/issue-modal.html
index 576dd8f3..e5e05ee8 100644
--- a/brewman/static/app/issue/issue-modal.html
+++ b/brewman/static/app/issue/issue-modal.html
@@ -8,17 +8,17 @@
-
-
+
\ No newline at end of file
diff --git a/brewman/static/app/issue/issue-voucher.resolver.ts b/brewman/static/app/issue/issue-voucher.resolver.ts
new file mode 100644
index 00000000..2522c7de
--- /dev/null
+++ b/brewman/static/app/issue/issue-voucher.resolver.ts
@@ -0,0 +1,15 @@
+import * as angular from 'angular';
+
+export function IssueVoucherResolver($route, Voucher) {
+ const id = $route.current.params.id,
+ source = $route.current.params.Source,
+ destination = $route.current.params.Destination;
+
+ if (!angular.isUndefined(source) && !angular.isUndefined(destination) && !angular.isUndefined(id)) {
+ return Voucher.get({type: 'Issue', Date: id, Source: source, Destination: destination}).$promise;
+ } else if (angular.isUndefined(source) && angular.isUndefined(destination) && !angular.isUndefined(id)) {
+ return Voucher.get({id: id}).$promise;
+ } else {
+ return Voucher.get({type: 'Issue'}).$promise;
+ }
+}
diff --git a/brewman/static/app/issue/issue.component.ts b/brewman/static/app/issue/issue.component.ts
new file mode 100644
index 00000000..23d1fc98
--- /dev/null
+++ b/brewman/static/app/issue/issue.component.ts
@@ -0,0 +1,7 @@
+import {IssueController} from "./issue.controller";
+
+export const IssueComponent = {
+ templateUrl: '/app/issue/issue.html',
+ controller: IssueController,
+ controllerAs: 'vm',
+};
\ No newline at end of file
diff --git a/brewman/static/app/issue/issue.controller.js b/brewman/static/app/issue/issue.controller.js
deleted file mode 100644
index 4c4b7401..00000000
--- a/brewman/static/app/issue/issue.controller.js
+++ /dev/null
@@ -1,294 +0,0 @@
-angular
- .module('overlord')
- .controller('IssueController', IssueController);
-IssueController.$inject = ['$scope', '$routeParams', '$location', 'asDateFilter', 'voucher', 'costCentres', 'smallGrid', 'IssueGrid', 'Voucher', '$uibModal', 'Batch', 'uibDateParser'];
-function IssueController($scope, $routeParams, $location, asDate, voucher, costCentres, smallGrid, IssueGrid, Voucher, $modal, Batch, dateParser) {
- var _voucher_Date = dateParser.parse(voucher.Date, "dd-MMM-yyyy");
- $scope.voucher_Date = function (value) {
- if (arguments.length) {
- $scope.voucher.Date = asDate(value);
- _voucher_Date = value;
- }
- return _voucher_Date;
- };
- $scope.voucher = voucher;
- $scope.costCentres = costCentres;
- $scope.smallGrid = smallGrid;
-
- if (angular.isUndefined($routeParams.Source) && angular.isUndefined($routeParams.Destination) && angular.isUndefined($routeParams.id)) {
- var date = $scope.voucher.Date;
- var source = getDebitCredit($scope.voucher.Journals, -1);
- var destination = getDebitCredit($scope.voucher.Journals, 1);
- $location.path('/Issue/' + date).search({Source: source, Destination: destination});
- }
-
- function getOld(productID, inventories) {
- return _.find(inventories, function (inventory) {
- return inventory.Product.ProductID === productID;
- });
- }
-
- $scope.add = function () {
- var oldInventory = getOld($scope.batch.Product.ProductID, $scope.voucher.Inventories),
- quantity = Number($scope.quantity),
- consumption = (getDebitCredit($scope.voucher.Journals, -1) === '7b845f95-dfef-fa4a-897c-f0baf15284a3');
-
- if (!$scope.batch || !$scope.batch.Product.ProductID || !quantity) {
- return;
- }
-
- if (!angular.isUndefined(oldInventory) &&
- oldInventory.Batch.BatchID === $scope.batch.BatchID &&
- (!consumption || oldInventory.Quantity + quantity <= $scope.batch.QuantityRemaining)) {
- oldInventory.Quantity += quantity;
- delete $scope.batch;
- delete $scope.quantity;
- $scope.foBatch = true;
- }
-
- if (angular.isUndefined(oldInventory) && (!consumption || quantity <= $scope.batch.QuantityRemaining)) {
- $scope.voucher.Inventories.push(
- {
- Product: $scope.batch.Product,
- Quantity: quantity,
- Rate: $scope.batch.Rate,
- Tax: $scope.batch.Tax,
- Discount: $scope.batch.Discount,
- Amount: quantity * $scope.batch.Rate * (1 + $scope.batch.Tax) * (1 - $scope.batch.Discount),
- Batch: $scope.batch
- });
- delete $scope.batch;
- delete $scope.quantity;
- $scope.foBatch = true;
- }
- };
- $scope.removeInventory = function (inventory) {
- var index = $scope.voucher.Inventories.indexOf(inventory);
- $scope.voucher.Inventories.splice(index, 1);
- };
-
- $scope.$watch('voucher.Date', function (newDate, oldDate) {
- var nDate = asDate(newDate),
- oDate = asDate(oldDate);
-
-
- if (nDate !== oDate && !angular.isUndefined(nDate)) {
- if (!angular.isUndefined($routeParams.Source) && !angular.isUndefined($routeParams.Destination) && !angular.isUndefined($routeParams.id)) {
- $location.path('/Issue/' + nDate).search({
- Source: $routeParams.Source,
- Destination: $routeParams.Destination
- });
- } else {
- $scope.smallGrid = IssueGrid.query({
- date: nDate,
- Source: $routeParams.Source,
- Destination: $routeParams.Destination
- });
- }
- }
- }, true);
-
- function getDebitCredit(journals, type) {
- for (var i = 0, l = journals.length; i < l; i++) {
- if (journals[i].Debit === type) {
- return journals[i].CostCentre.CostCentreID;
- }
- }
- }
-
- $scope.$watch('voucher.Journals', function (newJournals, oldJournals) {
- if (angular.isUndefined(newJournals) || angular.equals(newJournals, oldJournals)) {
- return;
- }
- if (!angular.isUndefined(oldJournals)) {
- if (getDebitCredit(oldJournals, -1) === getDebitCredit(newJournals, -1) && getDebitCredit(oldJournals, 1) === getDebitCredit(newJournals, 1)) {
- return;
- }
- }
-
- if (!angular.isUndefined($routeParams.Source) && !angular.isUndefined($routeParams.Destination) && !angular.isUndefined($routeParams.id)) {
- $location.path('/Issue/' + $scope.voucher.Date).search({
- Source: getDebitCredit(newJournals, -1),
- Destination: getDebitCredit(newJournals, 1)
- });
- } else {
- $scope.smallGrid = IssueGrid.query({
- date: $scope.voucher.Date,
- Source: getDebitCredit(newJournals, -1),
- Destination: getDebitCredit(newJournals, 1)
- });
- }
- }, true);
-
- $scope.$watch('voucher.Inventories', function (newInventories, oldInventories) {
- if (angular.isUndefined(newInventories) || angular.isUndefined(oldInventories)) {
- return;
- }
- var amount = 0;
- for (var i = 0, l = newInventories.length; i < l; i++) {
- amount += newInventories[i].Amount;
- }
- for (i = 0, l = $scope.voucher.Journals.length; i < l; i++) {
- $scope.voucher.Journals[i].Amount = amount;
- }
- }, true);
-
- $scope.resetVoucher = function () {
- var date = $scope.voucher.Date;
- var source = getDebitCredit($scope.voucher.Journals, -1);
- var destination = getDebitCredit($scope.voucher.Journals, 1);
- $location.path('/Issue/' + date).search({Source: source, Destination: destination});
- };
-
- $scope.preventAlteration = function (voucher) {
- if (angular.isUndefined(voucher.VoucherID)) {
- return !$scope.perms['Issue'];
- } else if (voucher.Posted && !$scope.perms['Edit Posted Vouchers']) {
- return true;
- } else if (voucher.User.UserID != $scope.auth.UserID && !$scope.perms["Edit Other User's Vouchers"]) {
- return true;
- } else {
- return false;
- }
- };
-
- $scope.get = function (voucherid) {
- $scope.voucher = Voucher.get({id: voucherid}, function (u, putResponseHeaders) {
- $location.path('/Issue/' + u.VoucherID);
- }, function (data, status) {
- $scope.toasts.push({Type: 'Danger', Message: data.data});
- });
- };
-
- $scope.save = function () {
- $scope.voucher.$save({type: 'Issue'}, function (u, putResponseHeaders) {
- $scope.toasts.push({Type: 'Success', Message: ''});
- $scope.redirectOnSave(u);
- }, function (data, status) {
- $scope.toasts.push({Type: 'Danger', Message: data.data});
- });
- };
-
- $scope.delete = function () {
- return $scope.voucher.$delete(function (u, putResponseHeaders) {
- $scope.toasts.push({Type: 'Success', Message: ''});
- var date = u.Date;
- var source = getDebitCredit(u.Journals, -1);
- var destination = getDebitCredit(u.Journals, 1);
- $location.path('/Issue/' + date).search({Source: source, Destination: destination}).replace();
- }, function (data, status) {
- $scope.toasts.push({Type: 'Danger', Message: data.data});
- });
- };
- $scope.redirectOnSave = function (voucher) {
- if (!angular.isUndefined($routeParams.Source) && !angular.isUndefined($routeParams.Destination) && !angular.isUndefined($routeParams.id)) {
- Voucher.get({
- type: 'Issue',
- Date: $routeParams.id,
- Source: $routeParams.Source,
- Destination: $routeParams.Destination
- }, function (u, putResponseHeaders) {
- $scope.voucher = u;
- });
- $scope.smallGrid = IssueGrid.query({
- date: $routeParams.id,
- Source: $routeParams.Source,
- Destination: $routeParams.Destination
- });
- } else {
- var date = voucher.Date;
- var source = getDebitCredit(voucher.Journals, -1);
- var destination = getDebitCredit(voucher.Journals, 1);
- $location.path('/Issue/' + date).search({Source: source, Destination: destination});
- }
- };
-
- $scope.modal = function (inventory) {
- $scope.selectedInventory = inventory;
- var edit = {};
- angular.copy($scope.selectedInventory, edit);
- var modalInstance = $modal.open({
- backdrop: true,
- size: 'lg',
- templateUrl: '/app/issue/issue-modal.html',
- controller: IssueModalController,
- resolve: {
- edit: function () {
- return edit;
- }
- }
- });
- modalInstance.result.then(function (updated) {
- if (updated.Product.ProductID !== $scope.selectedInventory.Batch.Product.ProductID) {
- var oldInventory = getOld(updated.Batch.Product.ProductID, $scope.voucher.Inventories);
- if (!angular.isUndefined(oldInventory)) {
- delete $scope.selectedInventory;
- return false;
- }
- }
- angular.copy(updated, $scope.selectedInventory);
- delete $scope.selectedInventory;
- }, function () {
- delete $scope.selectedInventory;
- });
- };
-
- $scope.confirm = function () {
- var modalInstance = $modal.open({
- backdrop: true,
- templateUrl: '/template/modal/confirm.html',
- controller: ['$scope', '$uibModalInstance', function ($scope, $modalInstance) {
- $scope.title = "Delete Voucher";
- $scope.body = "Are you sure? This cannot be undone.";
- $scope.isDelete = true;
- $scope.ok = function () {
- $modalInstance.close();
- };
- $scope.cancel = function () {
- $modalInstance.dismiss('cancel');
- };
- }]
- });
- modalInstance.result.then(function () {
- return $scope.delete();
- });
- return modalInstance;
- };
-
- $scope.batches = function ($viewValue) {
- var params = {term: $viewValue, count: 20, date: $scope.voucher.Date};
- return Batch.autocomplete(params).$promise;
- };
-}
-
-IssueController.resolve = {
- voucher: ['$route', 'Voucher', function ($route, Voucher) {
- var id = $route.current.params.id,
- source = $route.current.params.Source,
- destination = $route.current.params.Destination;
-
- if (!angular.isUndefined(source) && !angular.isUndefined(destination) && !angular.isUndefined(id)) {
- return Voucher.get({type: 'Issue', Date: id, Source: source, Destination: destination}).$promise;
- } else if (angular.isUndefined(source) && angular.isUndefined(destination) && !angular.isUndefined(id)) {
- return Voucher.get({id: id}).$promise;
- } else {
- return Voucher.get({type: 'Issue'}).$promise;
- }
- }],
- smallGrid: ['$route', 'IssueGrid', function ($route, IssueGrid) {
- var id = $route.current.params.id,
- source = $route.current.params.Source,
- destination = $route.current.params.Destination;
-
- if (!angular.isUndefined(source) && !angular.isUndefined(destination) && !angular.isUndefined(id)) {
- return IssueGrid.query({date: id, Source: source, Destination: destination}).$promise;
- } else if (angular.isUndefined(source) && angular.isUndefined(destination) && !angular.isUndefined(id)) {
- return IssueGrid.query({date: id}).$promise;
- } else {
- return [];
- }
- }],
- costCentres: ['CostCentre', function (CostCentre) {
- return CostCentre.query({}).$promise;
- }]
-};
diff --git a/brewman/static/app/issue/issue.controller.ts b/brewman/static/app/issue/issue.controller.ts
new file mode 100644
index 00000000..3b53129a
--- /dev/null
+++ b/brewman/static/app/issue/issue.controller.ts
@@ -0,0 +1,283 @@
+import * as angular from 'angular';
+import * as _ from 'lodash';
+import {IssueModalController} from './issue-modal.controller';
+
+export class IssueController {
+ static $inject = ['$scope', '$routeParams', '$location', 'asDateFilter', 'IssueGrid', 'Voucher', '$uibModal', 'Batch', 'uibDateParser', 'Messages', 'Credentials'];
+ _voucher_Date: any;
+ foBatch: any;
+ selectedInventory: any;
+ quantity: any;
+ batch: any;
+ voucher: any;
+ costCentres: any;
+ smallGrid: any;
+
+ constructor(public $scope, public $routeParams, public $location, public asDate, public IssueGrid, public Voucher, public $modal, public Batch, public dateParser, public Messages, public Credentials) {
+ this.voucher = $scope.$parent.res.voucher;
+ this.costCentres = $scope.$parent.res.costCentres;
+ this.smallGrid = $scope.$parent.res.smallGrid;
+ this._voucher_Date = dateParser.parse(this.voucher.Date, "dd-MMM-yyyy");
+ if (angular.isUndefined(this.$routeParams.Source) && angular.isUndefined(this.$routeParams.Destination) && angular.isUndefined(this.$routeParams.id)) {
+ const date = this.voucher.Date;
+ const source = this.getDebitCredit(this.voucher.Journals, -1);
+ const destination = this.getDebitCredit(this.voucher.Journals, 1);
+ this.$location.path('/Issue/' + date).search({Source: source, Destination: destination});
+ }
+ $scope.$watch('vm.voucher.Date', (newDate, oldDate) => {
+ const nDate = asDate(newDate),
+ oDate = asDate(oldDate);
+
+ if (nDate !== oDate && !angular.isUndefined(nDate)) {
+ if (!angular.isUndefined(this.$routeParams.Source) && !angular.isUndefined(this.$routeParams.Destination) && !angular.isUndefined(this.$routeParams.id)) {
+ this.$location.path('/Issue/' + nDate).search({
+ Source: this.$routeParams.Source,
+ Destination: this.$routeParams.Destination
+ });
+ } else {
+ this.smallGrid = this.IssueGrid.query({
+ date: nDate,
+ Source: this.$routeParams.Source,
+ Destination: this.$routeParams.Destination
+ });
+ }
+ }
+ }, true);
+
+ $scope.$watch('vm.voucher.Journals', (newJournals, oldJournals) => {
+ if (angular.isUndefined(newJournals) || angular.equals(newJournals, oldJournals)) {
+ return;
+ }
+ if (!angular.isUndefined(oldJournals)) {
+ if (this.getDebitCredit(oldJournals, -1) === this.getDebitCredit(newJournals, -1) && this.getDebitCredit(oldJournals, 1) === this.getDebitCredit(newJournals, 1)) {
+ return;
+ }
+ }
+
+ if (!angular.isUndefined(this.$routeParams.Source) && !angular.isUndefined(this.$routeParams.Destination) && !angular.isUndefined(this.$routeParams.id)) {
+ this.$location.path('/Issue/' + this.voucher.Date).search({
+ Source: this.getDebitCredit(newJournals, -1),
+ Destination: this.getDebitCredit(newJournals, 1)
+ });
+ } else {
+ this.smallGrid = this.IssueGrid.query({
+ date: this.voucher.Date,
+ Source: this.getDebitCredit(newJournals, -1),
+ Destination: this.getDebitCredit(newJournals, 1)
+ });
+ }
+ }, true);
+
+ $scope.$watch('vm.voucher.Inventories', (newInventories, oldInventories) => {
+ if (angular.isUndefined(newInventories) || angular.isUndefined(oldInventories)) {
+ return;
+ }
+ var amount = 0;
+ for (var i = 0, l = newInventories.length; i < l; i++) {
+ amount += newInventories[i].Amount;
+ }
+ for (i = 0, l = this.voucher.Journals.length; i < l; i++) {
+ this.voucher.Journals[i].Amount = amount;
+ }
+ }, true);
+ }
+
+ voucher_Date(value) {
+ if (arguments.length) {
+ this.voucher.Date = this.asDate(value);
+ this._voucher_Date = value;
+ }
+ return this._voucher_Date;
+ }
+
+ getOld(productID, inventories) {
+ return _.find(inventories, function (inventory) {
+ return inventory.Product.ProductID === productID;
+ });
+ }
+
+ add() {
+ const oldInventory = this.getOld(this.batch.Product.ProductID, this.voucher.Inventories),
+ quantity = Number(this.quantity),
+ consumption = (this.getDebitCredit(this.voucher.Journals, -1) === '7b845f95-dfef-fa4a-897c-f0baf15284a3');
+
+ if (!this.batch || !this.batch.Product.ProductID || !quantity) {
+ return;
+ }
+
+ if (!angular.isUndefined(oldInventory) &&
+ oldInventory.Batch.BatchID === this.batch.BatchID &&
+ (!consumption || oldInventory.Quantity + quantity <= this.batch.QuantityRemaining)) {
+ oldInventory.Quantity += quantity;
+ delete this.batch;
+ delete this.quantity;
+ this.foBatch = true;
+ }
+
+ if (angular.isUndefined(oldInventory) && (!consumption || quantity <= this.batch.QuantityRemaining)) {
+ this.voucher.Inventories.push(
+ {
+ Product: this.batch.Product,
+ Quantity: quantity,
+ Rate: this.batch.Rate,
+ Tax: this.batch.Tax,
+ Discount: this.batch.Discount,
+ Amount: quantity * this.batch.Rate * (1 + this.batch.Tax) * (1 - this.batch.Discount),
+ Batch: this.batch
+ });
+ delete this.batch;
+ delete this.quantity;
+ this.foBatch = true;
+ }
+ }
+
+ removeInventory(inventory) {
+ const index = this.voucher.Inventories.indexOf(inventory);
+ this.voucher.Inventories.splice(index, 1);
+ }
+
+ getDebitCredit(journals, type) {
+ for (var i = 0, l = journals.length; i < l; i++) {
+ if (journals[i].Debit === type) {
+ return journals[i].CostCentre.CostCentreID;
+ }
+ }
+ }
+
+ resetVoucher() {
+ const date = this.voucher.Date;
+ const source = this.getDebitCredit(this.voucher.Journals, -1);
+ const destination = this.getDebitCredit(this.voucher.Journals, 1);
+ this.$location.path('/Issue/' + date).search({Source: source, Destination: destination});
+ }
+
+ preventAlteration(voucher) {
+ if (angular.isUndefined(voucher.VoucherID)) {
+ return !this.Credentials.Perms['Issue'];
+ } else if (voucher.Posted && !this.Credentials.Perms['Edit Posted Vouchers']) {
+ return true;
+ } else if (voucher.User.UserID != this.Credentials.Auth.UserID && !this.Credentials.Perms["Edit Other User's Vouchers"]) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ get(voucherid) {
+ this.voucher = this.Voucher.get({id: voucherid}, (u, putResponseHeaders) => {
+ this.$location.path('/Issue/' + u.VoucherID);
+ }, (data, status) => {
+ this.Messages.push({Type: 'Danger', Message: data.data});
+ });
+ }
+
+ save() {
+ this.voucher.$save({type: 'Issue'}, (u, putResponseHeaders) => {
+ this.Messages.push({Type: 'Success', Message: ''});
+ this.redirectOnSave(u);
+ }, (data, status) => {
+ this.Messages.push({Type: 'Danger', Message: data.data});
+ });
+ }
+
+ delete() {
+ return this.voucher.$delete((u, putResponseHeaders) => {
+ this.Messages.push({Type: 'Success', Message: ''});
+ const date = u.Date;
+ const source = this.getDebitCredit(u.Journals, -1);
+ const destination = this.getDebitCredit(u.Journals, 1);
+ this.$location.path('/Issue/' + date).search({Source: source, Destination: destination}).replace();
+ }, (data, status) => {
+ this.Messages.push({Type: 'Danger', Message: data.data});
+ });
+ }
+
+ redirectOnSave(voucher) {
+ if (!angular.isUndefined(this.$routeParams.Source) && !angular.isUndefined(this.$routeParams.Destination) && !angular.isUndefined(this.$routeParams.id)) {
+ this.Voucher.get({
+ type: 'Issue',
+ Date: this.$routeParams.id,
+ Source: this.$routeParams.Source,
+ Destination: this.$routeParams.Destination
+ }, (u, putResponseHeaders) => {
+ this.voucher = u;
+ });
+ this.smallGrid = this.IssueGrid.query({
+ date: this.$routeParams.id,
+ Source: this.$routeParams.Source,
+ Destination: this.$routeParams.Destination
+ });
+ } else {
+ const date = voucher.Date;
+ const source = this.getDebitCredit(voucher.Journals, -1);
+ const destination = this.getDebitCredit(voucher.Journals, 1);
+ this.$location.path('/Issue/' + date).search({Source: source, Destination: destination});
+ }
+ }
+
+ modal(inventory) {
+ this.selectedInventory = inventory;
+ let edit = {};
+ angular.copy(this.selectedInventory, edit);
+ const modalInstance = this.$modal.open({
+ backdrop: true,
+ size: 'lg',
+ templateUrl: '/app/issue/issue-modal.html',
+ controllerAs: 'vmModal',
+ controller: IssueModalController,
+ resolve: {
+ edit: function () {
+ return edit;
+ }
+ }
+ });
+ modalInstance.result.then((updated) => {
+ if (updated.Product.ProductID !== this.selectedInventory.Batch.Product.ProductID) {
+ let oldInventory = this.getOld(updated.Batch.Product.ProductID, this.voucher.Inventories);
+ if (!angular.isUndefined(oldInventory)) {
+ delete this.selectedInventory;
+ return false;
+ }
+ }
+ angular.copy(updated, this.selectedInventory);
+ delete this.selectedInventory;
+ }, () => {
+ delete this.selectedInventory;
+ });
+ }
+
+ confirm() {
+ const modalInstance = this.$modal.open({
+ backdrop: true,
+ templateUrl: '/template/modal/confirm.html',
+ controller: ['$uibModalInstance', class {
+ title: any;
+ body: any;
+ isDelete: boolean;
+
+ constructor(public $modalInstance) {
+ this.title = "Delete Voucher";
+ this.body = "Are you sure? This cannot be undone.";
+ this.isDelete = true;
+ }
+
+ ok() {
+ this.$modalInstance.close();
+ }
+
+ cancel() {
+ this.$modalInstance.dismiss('cancel');
+ }
+ }]
+ });
+ modalInstance.result.then(() => {
+ return this.delete();
+ });
+ return modalInstance;
+ }
+
+ batches($viewValue) {
+ const params = {term: $viewValue, count: 20, date: this.voucher.Date};
+ return this.Batch.autocomplete(params).$promise;
+ }
+}
diff --git a/brewman/static/app/issue/issue.html b/brewman/static/app/issue/issue.html
index 0f84a10d..13f420fe 100644
--- a/brewman/static/app/issue/issue.html
+++ b/brewman/static/app/issue/issue.html
@@ -8,7 +8,7 @@
Load
-
+
{{item.Amount | currency}}
Load
-
+
+ ng-options="l.CostCentreID as l.Name for l in vm.costCentres">
-
+
+ ng-options="l.CostCentreID as l.Name for l in vm.costCentres">
₹
@@ -46,16 +46,16 @@
-
+
+ ng-model="vm.quantity" on-return="vm.add()"/>
-
@@ -73,7 +73,7 @@
-
+
{{inventory.Product.Name}}
{{inventory.Batch.Name}}
{{inventory.Quantity | number:2}}
@@ -81,12 +81,12 @@
{{inventory.Amount | currency}}
- Delete
@@ -99,25 +99,25 @@
-
+
-
- Created on {{voucher.CreationDate | localTime}} and Last Edited on {{voucher.LastEditDate | localTime}}
- by {{voucher.User.Name}}.
+ Created on {{vm.voucher.CreationDate | localTime}} and Last Edited on {{vm.voucher.LastEditDate | localTime}}
+ by {{vm.voucher.User.Name}}.
\ No newline at end of file
diff --git a/brewman/static/app/journal/journal-modal.controller.js b/brewman/static/app/journal/journal-modal.controller.js
deleted file mode 100644
index aa65b317..00000000
--- a/brewman/static/app/journal/journal-modal.controller.js
+++ /dev/null
@@ -1,28 +0,0 @@
-angular
- .module('overlord')
- .controller('JournalModalController', JournalModalController);
-JournalModalController.$inject = ['$scope', '$uibModalInstance', 'mathSolver', 'edit', 'Account'];
-function JournalModalController($scope, $modalInstance, mathSolver, edit, Account) {
- $scope.toggleDebit = function () {
- $scope.edit.Debit = ($scope.edit.Debit === 1) ? -1 : 1;
- };
-
- $scope.edit = edit;
- $scope.ok = function () {
- $scope.edit.Amount = mathSolver($scope.edit.Amount);
- if ($scope.edit.Amount < 0) {
- $scope.edit.Debit *= -1;
- $scope.edit.Amount *= -1;
- }
- else if (Number.isNaN($scope.edit.Amount)) {
- $scope.edit.Amount = 0;
- }
- $modalInstance.close($scope.edit);
- };
- $scope.cancel = function () {
- $modalInstance.dismiss('cancel');
- };
- $scope.accounts = function ($viewValue) {
- return Account.autocomplete({term: $viewValue, count: 20}).$promise;
- };
-}
diff --git a/brewman/static/app/journal/journal-modal.controller.ts b/brewman/static/app/journal/journal-modal.controller.ts
new file mode 100644
index 00000000..4470edf6
--- /dev/null
+++ b/brewman/static/app/journal/journal-modal.controller.ts
@@ -0,0 +1,32 @@
+export class JournalModalController {
+ static $inject = ['$scope', '$uibModalInstance', 'MathSolver', 'Account'];
+ edit:any;
+
+ constructor(public $scope, public $modalInstance, public MathSolver, public Account) {
+ this.edit = $scope.$resolve.edit;
+ }
+
+ toggleDebit() {
+ this.edit.Debit = (this.edit.Debit === 1) ? -1 : 1;
+ }
+
+ ok() {
+ this.edit.Amount = this.MathSolver(this.edit.Amount);
+ if (this.edit.Amount < 0) {
+ this.edit.Debit *= -1;
+ this.edit.Amount *= -1;
+ }
+ else if (Number.isNaN(this.edit.Amount)) {
+ this.edit.Amount = 0;
+ }
+ this.$modalInstance.close(this.edit);
+ }
+
+ cancel() {
+ this.$modalInstance.dismiss('cancel');
+ }
+
+ accounts($viewValue) {
+ return this.Account.autocomplete({term: $viewValue, count: 20}).$promise;
+ }
+}
diff --git a/brewman/static/app/journal/journal-modal.html b/brewman/static/app/journal/journal-modal.html
index 605ebc62..baf4b4bb 100644
--- a/brewman/static/app/journal/journal-modal.html
+++ b/brewman/static/app/journal/journal-modal.html
@@ -10,24 +10,24 @@
-
-
₹
+ ng-model="vmModal.edit.Amount"/>
\ No newline at end of file
diff --git a/brewman/static/app/journal/journal-voucher.resolver.ts b/brewman/static/app/journal/journal-voucher.resolver.ts
new file mode 100644
index 00000000..010e23ce
--- /dev/null
+++ b/brewman/static/app/journal/journal-voucher.resolver.ts
@@ -0,0 +1,10 @@
+import * as angular from 'angular';
+
+export function JournalVoucherResolver($route, Voucher) {
+ const id = $route.current.params.id;
+ if (angular.isUndefined(id)) {
+ return Voucher.get({type: 'Journal'}).$promise;
+ } else {
+ return Voucher.get({id: id}).$promise;
+ }
+}
diff --git a/brewman/static/app/journal/journal.component.ts b/brewman/static/app/journal/journal.component.ts
new file mode 100644
index 00000000..0be8bcfa
--- /dev/null
+++ b/brewman/static/app/journal/journal.component.ts
@@ -0,0 +1,7 @@
+import {JournalController} from "./journal.controller";
+
+export const JournalComponent = {
+ templateUrl: '/app/journal/journal.html',
+ controller: JournalController,
+ controllerAs: 'vm',
+};
\ No newline at end of file
diff --git a/brewman/static/app/journal/journal.controller.js b/brewman/static/app/journal/journal.controller.js
deleted file mode 100644
index 53f240c9..00000000
--- a/brewman/static/app/journal/journal.controller.js
+++ /dev/null
@@ -1,215 +0,0 @@
-angular
- .module('overlord')
- .controller('JournalController', JournalController);
-
-JournalController.$inject = ['$scope', '$location', 'asDateFilter', '$uibModal', 'uploadedImageResizer', 'mathSolver', 'voucher', 'Account', 'uibDateParser'];
-
-function JournalController($scope, $location, asDate, $modal, uploadedImageResizer, mathSolver, voucher, Account, dateParser) {
- var _voucher_Date = dateParser.parse(voucher.Date, "dd-MMM-yyyy");
- $scope.voucher_Date = function (value) {
- if (arguments.length) {
- $scope.voucher.Date = asDate(value);
- _voucher_Date = value;
- }
- return _voucher_Date;
- };
- $scope.foAccount = true;
-
- $scope.voucher = voucher;
- $scope.debit = "1";
- function getOld(ledgerID, journals) {
- return _.find(journals, function (journal) {
- return journal.Ledger.LedgerID === ledgerID;
- });
- }
-
- $scope.$on("fileSelected", function (event, args) {
- uploadedImageResizer(args, $scope.voucher.Files);
- });
-
-
- $scope.deleteFile = function (item) {
- var index = $scope.voucher.Files.indexOf(item);
- $scope.voucher.Files.splice(index, 1);
- };
-
- $scope.zoomImage = function (item) {
- $modal.open({
- templateUrl: '/template/modal/image.html',
- controller: ['$scope', '$uibModalInstance', function ($scope, $modalInstance) {
- $scope.imageUrl = item.Resized;
- $scope.size = null;
- $scope.cancel = function () {
- $modalInstance.dismiss('cancel');
- };
- }]
- });
- };
-
- $scope.add = function () {
- var amount,
- oldJournal,
- debit = parseInt($scope.debit);
-
- if (!$scope.account || !$scope.account.LedgerID) {
- return;
- }
- amount = mathSolver($scope.amount);
- if (Number.isNaN(amount) || amount === 0) {
- return;
- }
- if (amount < 0) {
- amount *= -1;
- debit *= -1;
- }
- oldJournal = getOld($scope.account.LedgerID, $scope.voucher.Journals);
- if (!angular.isUndefined(oldJournal)) {
- amount = (oldJournal.Debit * oldJournal.Amount) + (debit * amount);
- if (amount < 0) {
- oldJournal.Debit = -1;
- oldJournal.Amount = amount * -1;
- } else {
- oldJournal.Debit = 1;
- oldJournal.Amount = amount;
- }
- } else {
- $scope.voucher.Journals.push({Debit: debit, Amount: amount, Ledger: $scope.account});
- }
- delete $scope.account;
- delete $scope.amount;
- $scope.foAccount = true;
- };
-
- $scope.removeJournal = function (journal) {
- var index = $scope.voucher.Journals.indexOf(journal);
- $scope.voucher.Journals.splice(index, 1);
- };
-
- $scope.$watch('voucher.Journals', function (journals) {
- if (!angular.isArray(journals)) {
- return;
- }
- var amount = journals.reduce(function (previousValue, currentValue) {
- return previousValue + (currentValue.Amount * currentValue.Debit);
- }, 0);
- $scope.amount = Math.abs(amount);
- }, true);
-
- $scope.$watch('account', function (account) {
- if (!account) {
- delete $scope.accBal;
- }
- else {
- Account.balance({id: account.LedgerID, d: $scope.voucher.Date}, function (bal) {
- $scope.accBal = bal;
- });
- }
- }, true);
-
- $scope.preventAlteration = function (voucher) {
- if (angular.isUndefined($scope.perms)) {
- return false;
- } else if (angular.isUndefined(voucher.VoucherID)) {
- return !$scope.perms['Journal'];
- } else if (voucher.Posted && !$scope.perms['Edit Posted Vouchers']) {
- return true;
- } else if (voucher.User.UserID !== $scope.auth.UserID && !$scope.perms["Edit Other User's Vouchers"]) {
- return true;
- } else {
- return false;
- }
- };
-
- $scope.save = function () {
- return $scope.voucher.$save({type: 'Journal'}, function (u, putResponseHeaders) {
- $scope.toasts.push({Type: 'Success', Message: ''});
- $location.path('/Journal/' + u.VoucherID);
- }, function (data, status) {
- $scope.toasts.push({Type: 'Danger', Message: data.data});
- });
- };
-
- $scope.delete = function () {
- $scope.voucher.$delete(function (u, putResponseHeaders) {
- $scope.toasts.push({Type: 'Success', Message: ''});
- $location.path('/Journal').replace();
- }, function (data, status) {
- $scope.toasts.push({Type: 'Danger', Message: data.data});
- });
- };
-
- $scope.post = function () {
- return $scope.voucher.$post(function (u, putResponseHeaders) {
- $scope.toasts.push({Type: 'Success', Message: ''});
- }, function (data, status) {
- $scope.toasts.push({Type: 'Danger', Message: data.data});
- });
- };
-
- $scope.modal = function (journal) {
- $scope.selectedJournal = journal;
- var edit = {};
- angular.copy($scope.selectedJournal, edit);
- var modalInstance = $modal.open({
- backdrop: true,
- size: 'lg',
- templateUrl: '/app/journal/journal-modal.html',
- controller: JournalModalController,
- resolve: {
- edit: function () {
- return edit;
- }
- }
- });
- modalInstance.result.then(function (updated) {
- if (updated.Ledger.LedgerID !== $scope.selectedJournal.Ledger.LedgerID) {
- var oldJournal = getOld(updated.Ledger.LedgerID, $scope.voucher.Journals);
- if (!angular.isUndefined(oldJournal)) {
- delete $scope.selectedJournal;
- return false;
- }
- }
- angular.copy(updated, $scope.selectedJournal);
- delete $scope.selectedJournal;
- }, function () {
- delete $scope.selectedJournal;
- }
- );
- };
-
- $scope.confirm = function () {
- var modalInstance = $modal.open({
- backdrop: true,
- templateUrl: '/template/modal/confirm.html',
- controller: ['$scope', '$uibModalInstance', function ($scope, $modalInstance) {
- $scope.title = "Delete Voucher";
- $scope.body = "Are you sure? This cannot be undone.";
- $scope.isDelete = true;
- $scope.ok = function () {
- $modalInstance.close();
- };
- $scope.cancel = function () {
- $modalInstance.dismiss('cancel');
- };
- }]
- });
- modalInstance.result.then(function () {
- $scope.delete();
- });
- };
-
- $scope.accounts = function ($viewValue) {
- return Account.autocomplete({term: $viewValue, count: 20}).$promise;
- };
-}
-
-JournalController.resolve = {
- voucher: ['$route', 'Voucher', function ($route, Voucher) {
- var id = $route.current.params.id;
- if (angular.isUndefined(id)) {
- return Voucher.get({type: 'Journal'}).$promise;
- } else {
- return Voucher.get({id: id}).$promise;
- }
- }]
-};
diff --git a/brewman/static/app/journal/journal.controller.ts b/brewman/static/app/journal/journal.controller.ts
new file mode 100644
index 00000000..65869193
--- /dev/null
+++ b/brewman/static/app/journal/journal.controller.ts
@@ -0,0 +1,229 @@
+import * as angular from 'angular';
+import * as _ from 'lodash';
+import {JournalModalController} from './journal-modal.controller';
+
+export class JournalController {
+ static $inject = ['$scope', '$location', 'asDateFilter', '$uibModal', 'UploadedImageResizer', 'MathSolver', 'Account', 'uibDateParser', 'Messages', 'Credentials'];
+ _voucher_Date: any;
+ foAccount: any;
+ debit: any;
+ selectedJournal: any;
+ amount: any;
+ account: any;
+ voucher: any;
+ accBal: any;
+
+ constructor(public $scope, public $location, public asDate, public $modal, public UploadedImageResizer, public MathSolver, public Account, public dateParser, public Messages, public Credentials) {
+ this.voucher = $scope.$parent.res.voucher;
+ this._voucher_Date = dateParser.parse(this.voucher.Date, "dd-MMM-yyyy");
+ this.foAccount = true;
+ this.debit = "1";
+ $scope.$on("fileSelected", (event, args) => {
+ UploadedImageResizer(args, this.voucher.Files);
+ });
+ $scope.$watch('vm.voucher.Journals', (journals) => {
+ if (!angular.isArray(journals)) {
+ return;
+ }
+ const amount = journals.reduce(function (previousValue, currentValue) {
+ return previousValue + (currentValue.Amount * currentValue.Debit);
+ }, 0);
+ this.amount = Math.abs(amount);
+ }, true);
+
+ $scope.$watch('vm.account', (account) => {
+ if (!account) {
+ delete this.accBal;
+ }
+ else {
+ Account.balance({id: account.LedgerID, d: this.voucher.Date}, (bal) => {
+ this.accBal = bal;
+ });
+ }
+ }, true);
+ }
+
+ voucher_Date(value) {
+ if (arguments.length) {
+ this.voucher.Date = this.asDate(value);
+ this._voucher_Date = value;
+ }
+ return this._voucher_Date;
+ }
+
+ getOld(ledgerID, journals) {
+ return _.find(journals, function (journal) {
+ return journal.Ledger.LedgerID === ledgerID;
+ });
+ }
+
+ deleteFile(item) {
+ const index = this.voucher.Files.indexOf(item);
+ this.voucher.Files.splice(index, 1);
+ }
+
+ zoomImage(item) {
+ this.$modal.open({
+ templateUrl: '/template/modal/image.html',
+ controllerAs: 'vmModal',
+ controller: ['$uibModalInstance', class {
+ imageUrl: any;
+ size: any;
+
+ constructor(public $modalInstance) {
+ this.imageUrl = item.Resized;
+ this.size = null;
+ }
+
+ cancel() {
+ this.$modalInstance.dismiss('cancel');
+ }
+ }]
+ });
+ }
+
+ add() {
+ let amount,
+ oldJournal,
+ debit = parseInt(this.debit);
+
+ if (!this.account || !this.account.LedgerID) {
+ return;
+ }
+ amount = this.MathSolver(this.amount);
+ if (Number.isNaN(amount) || amount === 0) {
+ return;
+ }
+ if (amount < 0) {
+ amount *= -1;
+ debit *= -1;
+ }
+ oldJournal = this.getOld(this.account.LedgerID, this.voucher.Journals);
+ if (!angular.isUndefined(oldJournal)) {
+ amount = (oldJournal.Debit * oldJournal.Amount) + (debit * amount);
+ if (amount < 0) {
+ oldJournal.Debit = -1;
+ oldJournal.Amount = amount * -1;
+ } else {
+ oldJournal.Debit = 1;
+ oldJournal.Amount = amount;
+ }
+ } else {
+ this.voucher.Journals.push({Debit: debit, Amount: amount, Ledger: this.account});
+ }
+ delete this.account;
+ delete this.amount;
+ this.foAccount = true;
+ }
+
+ removeJournal(journal) {
+ const index = this.voucher.Journals.indexOf(journal);
+ this.voucher.Journals.splice(index, 1);
+ }
+
+ preventAlteration(voucher) {
+ if (angular.isUndefined(this.Credentials.Perms)) {
+ return false;
+ } else if (angular.isUndefined(voucher.VoucherID)) {
+ return !this.Credentials.Perms['Journal'];
+ } else if (voucher.Posted && !this.Credentials.Perms['Edit Posted Vouchers']) {
+ return true;
+ } else if (voucher.User.UserID !== this.Credentials.Auth.UserID && !this.Credentials.Perms["Edit Other User's Vouchers"]) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ save() {
+ return this.voucher.$save({type: 'Journal'}, (u, putResponseHeaders) => {
+ this.Messages.push({Type: 'Success', Message: ''});
+ this.$location.path('/Journal/' + u.VoucherID);
+ }, (data, status) => {
+ this.Messages.push({Type: 'Danger', Message: data.data});
+ });
+ }
+
+ delete() {
+ this.voucher.$delete((u, putResponseHeaders) => {
+ this.Messages.push({Type: 'Success', Message: ''});
+ this.$location.path('/Journal').replace();
+ }, (data, status) => {
+ this.Messages.push({Type: 'Danger', Message: data.data});
+ });
+ }
+
+ post() {
+ return this.voucher.$post((u, putResponseHeaders) => {
+ this.Messages.push({Type: 'Success', Message: ''});
+ }, (data, status) => {
+ this.Messages.push({Type: 'Danger', Message: data.data});
+ });
+ }
+
+ modal(journal) {
+ this.selectedJournal = journal;
+ let edit = {};
+ angular.copy(this.selectedJournal, edit);
+ const modalInstance = this.$modal.open({
+ backdrop: true,
+ size: 'lg',
+ templateUrl: '/app/journal/journal-modal.html',
+ controllerAs: 'vmModal',
+ controller: JournalModalController,
+ resolve: {
+ edit: function () {
+ return edit;
+ }
+ }
+ });
+ modalInstance.result.then((updated) => {
+ if (updated.Ledger.LedgerID !== this.selectedJournal.Ledger.LedgerID) {
+ const oldJournal = this.getOld(updated.Ledger.LedgerID, this.voucher.Journals);
+ if (!angular.isUndefined(oldJournal)) {
+ delete this.selectedJournal;
+ return false;
+ }
+ }
+ angular.copy(updated, this.selectedJournal);
+ delete this.selectedJournal;
+ }, () => {
+ delete this.selectedJournal;
+ }
+ );
+ }
+
+ confirm() {
+ const modalInstance = this.$modal.open({
+ backdrop: true,
+ templateUrl: '/template/modal/confirm.html',
+ controllerAs: 'vmModal',
+ controller: ['$uibModalInstance', class {
+ title: any;
+ body: any;
+ isDelete: boolean;
+
+ constructor(public $modalInstance) {
+ this.title = "Delete Voucher";
+ this.body = "Are you sure? This cannot be undone.";
+ this.isDelete = true;
+ }
+
+ ok() {
+ this.$modalInstance.close();
+ }
+
+ cancel() {
+ this.$modalInstance.dismiss('cancel');
+ }
+ }]
+ });
+ modalInstance.result.then(() => {
+ this.delete();
+ });
+ }
+
+ accounts($viewValue) {
+ return this.Account.autocomplete({term: $viewValue, count: 20}).$promise;
+ }
+}
diff --git a/brewman/static/app/journal/journal.html b/brewman/static/app/journal/journal.html
index 09757a81..b28aad1d 100644
--- a/brewman/static/app/journal/journal.html
+++ b/brewman/static/app/journal/journal.html
@@ -7,7 +7,7 @@
@@ -19,26 +19,26 @@
-
-
+
- Balance as on Date: {{accBal.Date | accounting}} / {{accBal.Total
+ Balance as on Date: {{vm.accBal.Date | accounting}} / {{vm.accBal.Total
| accounting}}
₹
+ ng-model="vm.amount" on-return="vm.add()"/>
-
@@ -56,18 +56,18 @@
-
+
{{journal.Debit | debit}}
{{journal.Ledger.Name}}
{{journal.Amount | currency}}
- Delete
@@ -80,14 +80,14 @@
-
+
-
+
-| Code | @@ -23,8 +23,8 @@||||||||
|---|---|---|---|---|---|---|---|---|
| {{item.Code}} | {{item.Name}} | {{item.Designation}} | diff --git a/brewman/static/app/employee/employee-list.resolver.ts b/brewman/static/app/employee/employee-list.resolver.ts new file mode 100644 index 00000000..634a621e --- /dev/null +++ b/brewman/static/app/employee/employee-list.resolver.ts @@ -0,0 +1,3 @@ +export function EmployeeListResolver(Employee) { + return Employee.query({}).$promise; +} diff --git a/brewman/static/app/employee/employee.component.ts b/brewman/static/app/employee/employee.component.ts new file mode 100644 index 00000000..d5c3fbdf --- /dev/null +++ b/brewman/static/app/employee/employee.component.ts @@ -0,0 +1,7 @@ +import {EmployeeController} from './employee.controller'; + +export const EmployeeComponent = { + templateUrl: '/app/employee/employee-detail.html', + controller: EmployeeController, + controllerAs: 'vm' +}; \ No newline at end of file diff --git a/brewman/static/app/employee/employee.controller.js b/brewman/static/app/employee/employee.controller.js deleted file mode 100644 index f8388be1..00000000 --- a/brewman/static/app/employee/employee.controller.js +++ /dev/null @@ -1,75 +0,0 @@ -angular - .module('overlord') - .controller('EmployeeController', EmployeeController); -EmployeeController.$inject = ['$scope', '$routeParams', '$location', 'asDateFilter', '$uibModal', 'employee', 'costCentres', 'uibDateParser']; -function EmployeeController($scope, $routeParams, $location, asDate, $modal, employee, costCentres, dateParser) { - var _employee_JoiningDate = dateParser.parse(employee.JoiningDate, "dd-MMM-yyyy"), - _employee_LeavingDate = dateParser.parse(employee.LeavingDate, "dd-MMM-yyyy"); - $scope.employee_JoiningDate = function (value) { - if (arguments.length) { - $scope.employee.JoiningDate = asDate(value); - _employee_JoiningDate = value; - } - return _employee_JoiningDate; - }; - $scope.employee_LeavingDate = function (value) { - if (arguments.length) { - $scope.employee.LeavingDate = asDate(value); - _employee_LeavingDate = value; - } - return _employee_LeavingDate; - }; - $scope.employee = employee; - - $scope.costCentres = costCentres; - - $scope.save = function () { - $scope.employee.$save(function (u, putResponseHeaders) { - $scope.toasts.push({Type: 'Success', Message: u.Code}); - $location.path('/Employees'); - }, function (data, status) { - $scope.toasts.push({Type: 'Danger', Message: data.data}); - }); - }; - - $scope.delete = function () { - $scope.employee.$delete(function (u, putResponseHeaders) { - $scope.toasts.push({Type: 'Success', Message: ''}); - $location.path('/Employees'); - }, function (data, status) { - $scope.toasts.push({Type: 'Danger', Message: data.data}); - }); - }; - - $scope.confirm = function () { - var modalInstance = $modal.open({ - backdrop: true, - templateUrl: '/template/modal/confirm.html', - controller: ['$scope', '$uibModalInstance', function ($scope, $modalInstance) { - $scope.title = "Delete Employee"; - $scope.body = "Are you sure? This cannot be undone."; - $scope.isDelete = true; - $scope.ok = function () { - $modalInstance.close(); - }; - $scope.cancel = function () { - $modalInstance.dismiss('cancel'); - }; - }] - }); - modalInstance.result.then(function () { - $scope.delete(); - }); - }; - $scope.foName = true; -} - -EmployeeController.resolve = { - employee: ['$route', 'Employee', function ($route, Employee) { - var id = $route.current.params.id; - return Employee.get({id: id}).$promise; - }], - costCentres: ['CostCentre', function (CostCentre) { - return CostCentre.query({}).$promise; - }] -}; diff --git a/brewman/static/app/employee/employee.controller.ts b/brewman/static/app/employee/employee.controller.ts new file mode 100644 index 00000000..19d53545 --- /dev/null +++ b/brewman/static/app/employee/employee.controller.ts @@ -0,0 +1,79 @@ +export class EmployeeController { + static $inject = ['$scope', '$routeParams', '$location', 'asDateFilter', '$uibModal', 'uibDateParser', 'Messages']; + _employee_JoiningDate: any; + _employee_LeavingDate: any; + foName: boolean; + employee: any; + costCentres: any; + + constructor(public $scope, public $routeParams, public $location, public asDate, public $modal, public dateParser, public Messages) { + this.employee = $scope.$parent.res.employee; + this.costCentres = $scope.$parent.res.costCentres; + this._employee_JoiningDate = dateParser.parse(this.employee.JoiningDate, "dd-MMM-yyyy"); + this._employee_LeavingDate = dateParser.parse(this.employee.LeavingDate, "dd-MMM-yyyy"); + this.foName = true; + } + + employee_JoiningDate(value) { + if (arguments.length) { + this.employee.JoiningDate = this.asDate(value); + this._employee_JoiningDate = value; + } + return this._employee_JoiningDate; + } + + employee_LeavingDate(value) { + if (arguments.length) { + this.employee.LeavingDate = this.asDate(value); + this._employee_LeavingDate = value; + } + return this._employee_LeavingDate; + } + + save() { + this.employee.$save((u, putResponseHeaders) => { + this.Messages.push({Type: 'Success', Message: u.Code}); + this.$location.path('/Employees'); + }, (data, status) => { + this.Messages.push({Type: 'Danger', Message: data.data}); + }); + } + + delete() { + this.employee.$delete((u, putResponseHeaders) => { + this.Messages.push({Type: 'Success', Message: ''}); + this.$location.path('/Employees'); + }, (data, status) => { + this.Messages.push({Type: 'Danger', Message: data.data}); + }); + } + + confirm() { + const modalInstance = this.$modal.open({ + backdrop: true, + templateUrl: '/template/modal/confirm.html', + controller: ['$uibModalInstance', class { + title: any; + body: any; + isDelete: boolean; + + constructor(public $modalInstance) { + this.title = "Delete Employee"; + this.body = "Are you sure? This cannot be undone."; + this.isDelete = true; + } + + ok() { + this.$modalInstance.close(); + } + + cancel() { + this.$modalInstance.dismiss('cancel'); + } + }] + }); + modalInstance.result.then(() => { + this.delete(); + }); + } +} diff --git a/brewman/static/app/employee/employee.resolver.ts b/brewman/static/app/employee/employee.resolver.ts new file mode 100644 index 00000000..f4c03377 --- /dev/null +++ b/brewman/static/app/employee/employee.resolver.ts @@ -0,0 +1,4 @@ +export function EmployeeResolver($route, Employee) { + const id = $route.current.params.id; + return Employee.get({id: id}).$promise; +} diff --git a/brewman/static/app/employee/employee.service.ts b/brewman/static/app/employee/employee.service.ts new file mode 100644 index 00000000..f52a9045 --- /dev/null +++ b/brewman/static/app/employee/employee.service.ts @@ -0,0 +1,7 @@ +export function Employee($resource) { + return $resource('/api/Employee/:id', + {id: '@LedgerID'}, { + query: {method: 'GET', params: {list: true}, isArray: true}, + autocomplete: {method: 'GET', params: {term: ''}, isArray: true} + }); +} diff --git a/brewman/static/app/group/group-detail.html b/brewman/static/app/group/group-detail.html index 52029164..e0480d4b 100644 --- a/brewman/static/app/group/group-detail.html +++ b/brewman/static/app/group/group-detail.html @@ -5,24 +5,24 @@||||||
| {{item.Name}} |
@@ -19,9 +19,9 @@
- Total Service Charge: {{voucher.ServiceCharge | number:2}}
- Total Points: {{TotalPoints() | number:2}}
- Point Value: {{PointValue() | number:2}}
+ Total Service Charge: {{vm.voucher.ServiceCharge | number:2}}
+ Total Points: {{vm.TotalPoints() | number:2}}
+ Point Value: {{vm.PointValue() | number:2}}
-
- Created on {{voucher.CreationDate | localTime}} and Last Edited on {{voucher.LastEditDate | localTime}}
- by {{voucher.User.Name}}. Posted by {{voucher.Poster}}
+ Created on {{vm.voucher.CreationDate | localTime}} and Last Edited on {{vm.voucher.LastEditDate | localTime}}
+ by {{vm.voucher.User.Name}}. Posted by {{vm.voucher.Poster}}
diff --git a/brewman/static/app/issue/batch.service.ts b/brewman/static/app/issue/batch.service.ts
new file mode 100644
index 00000000..28a744aa
--- /dev/null
+++ b/brewman/static/app/issue/batch.service.ts
@@ -0,0 +1,5 @@
+export function Batch ($resource) {
+ return $resource('/api/Batch', {}, {
+ autocomplete: {method: 'GET', params: {term: ''}, isArray: true}
+ });
+}
diff --git a/brewman/static/app/issue/issue-grid.resolver.ts b/brewman/static/app/issue/issue-grid.resolver.ts
new file mode 100644
index 00000000..22de84a5
--- /dev/null
+++ b/brewman/static/app/issue/issue-grid.resolver.ts
@@ -0,0 +1,15 @@
+import * as angular from 'angular';
+
+export function IssueGridResolver($route, IssueGrid) {
+ const id = $route.current.params.id,
+ source = $route.current.params.Source,
+ destination = $route.current.params.Destination;
+
+ if (!angular.isUndefined(source) && !angular.isUndefined(destination) && !angular.isUndefined(id)) {
+ return IssueGrid.query({date: id, Source: source, Destination: destination}).$promise;
+ } else if (angular.isUndefined(source) && angular.isUndefined(destination) && !angular.isUndefined(id)) {
+ return IssueGrid.query({date: id}).$promise;
+ } else {
+ return {};
+ }
+}
diff --git a/brewman/static/app/issue/issue-grid.service.ts b/brewman/static/app/issue/issue-grid.service.ts
new file mode 100644
index 00000000..a9aa9984
--- /dev/null
+++ b/brewman/static/app/issue/issue-grid.service.ts
@@ -0,0 +1,3 @@
+export function IssueGrid($resource) {
+ return $resource('/api/Issues/Services/:date');
+}
diff --git a/brewman/static/app/issue/issue-modal.controller.js b/brewman/static/app/issue/issue-modal.controller.js
deleted file mode 100644
index 56b3be64..00000000
--- a/brewman/static/app/issue/issue-modal.controller.js
+++ /dev/null
@@ -1,22 +0,0 @@
-angular
- .module('overlord')
- .controller('IssueModalController', IssueModalController);
-IssueModalController.$inject = ['$scope', '$uibModalInstance', 'edit', 'Batch'];
-function IssueModalController($scope, $modalInstance, edit, Batch) {
- $scope.edit = edit;
- $scope.ok = function () {
- $scope.edit.Product = $scope.edit.Batch.Product;
- $scope.edit.Quantity = Number($scope.edit.Quantity);
- $scope.edit.Tax = $scope.edit.Batch.Tax;
- $scope.edit.Discount = $scope.edit.Batch.Discount;
- $scope.edit.Rate = $scope.edit.Batch.Rate;
- $scope.edit.Amount = $scope.edit.Quantity * $scope.edit.Rate * (1 + $scope.edit.Tax) * (1 - $scope.edit.Discount);
- $modalInstance.close($scope.edit);
- };
- $scope.cancel = function () {
- $modalInstance.dismiss('cancel');
- };
- $scope.batches = function ($viewValue) {
- return Batch.autocomplete({term: $viewValue, count: 20}).$promise;
- };
-}
diff --git a/brewman/static/app/issue/issue-modal.controller.ts b/brewman/static/app/issue/issue-modal.controller.ts
new file mode 100644
index 00000000..19c7e244
--- /dev/null
+++ b/brewman/static/app/issue/issue-modal.controller.ts
@@ -0,0 +1,26 @@
+export class IssueModalController {
+ static $inject = ['$scope', '$uibModalInstance', 'Batch'];
+ edit:any;
+
+ constructor(public $scope, public $modalInstance, public Batch) {
+ this.edit = $scope.$resolve.edit;
+ }
+
+ ok() {
+ this.edit.Product = this.edit.Batch.Product;
+ this.edit.Quantity = Number(this.edit.Quantity);
+ this.edit.Tax = this.edit.Batch.Tax;
+ this.edit.Discount = this.edit.Batch.Discount;
+ this.edit.Rate = this.edit.Batch.Rate;
+ this.edit.Amount = this.edit.Quantity * this.edit.Rate * (1 + this.edit.Tax) * (1 - this.edit.Discount);
+ this.$modalInstance.close(this.edit);
+ }
+
+ cancel() {
+ this.$modalInstance.dismiss('cancel');
+ }
+
+ batches($viewValue) {
+ return this.Batch.autocomplete({term: $viewValue, count: 20}).$promise;
+ }
+}
diff --git a/brewman/static/app/issue/issue-modal.html b/brewman/static/app/issue/issue-modal.html
index 576dd8f3..e5e05ee8 100644
--- a/brewman/static/app/issue/issue-modal.html
+++ b/brewman/static/app/issue/issue-modal.html
@@ -8,17 +8,17 @@
-
-
+
Load |
| ||||||
| {{item.Amount | currency}} |
Load
+
+ ng-options="l.CostCentreID as l.Name for l in vm.costCentres">
-
+
+ ng-options="l.CostCentreID as l.Name for l in vm.costCentres">
₹
@@ -46,16 +46,16 @@
-
+
+ ng-model="vm.quantity" on-return="vm.add()"/>
-
@@ -73,7 +73,7 @@
| |||||||
| {{inventory.Product.Name}} | {{inventory.Batch.Name}} | {{inventory.Quantity | number:2}} | @@ -81,12 +81,12 @@{{inventory.Amount | currency}} |
- Delete
|
@@ -99,25 +99,25 @@
||||
| {{journal.Debit | debit}} | {{journal.Ledger.Name}} | {{journal.Amount | currency}} |
- Delete
|
@@ -80,14 +80,14 @@