diff --git a/brewman/brewman/models/master.py b/brewman/brewman/models/master.py index 84225f0f..c4db6676 100644 --- a/brewman/brewman/models/master.py +++ b/brewman/brewman/models/master.py @@ -1,5 +1,5 @@ import uuid -from sqlalchemy import UniqueConstraint, Column, Integer, Unicode, Numeric, Boolean, ForeignKey, func, DateTime +from sqlalchemy import UniqueConstraint, Column, Integer, Unicode, Numeric, Boolean, ForeignKey, func, DateTime, desc from sqlalchemy.orm import relationship from brewman.models import Base, DBSession from brewman.models.guidtype import GUID @@ -26,7 +26,6 @@ class Product(Base): batches = relationship('Batch', backref='product') inventories = relationship('Inventory', backref='product') - ledger = relationship('Ledger', primaryjoin="Ledger.id==Product.ledger_id") def __init__(self, code=None, name=None, units=None, fraction=None, fraction_units=None, yeild=None, @@ -247,14 +246,14 @@ class Employee(LedgerBase): attendances = relationship('Attendance', backref='employe', cascade=None, cascade_backrefs=False) - def __init__(self, code=None, name=None, type=None, parent_ledger_id=None, is_active=None, costcenter_id=None, - designation=None, salary=None, service_points=None, joining_date=None, leaving_date=None): + def __init__(self, code=None, name=None, is_active=None, costcenter_id=None, designation=None, salary=None, + service_points=None, joining_date=None, leaving_date=None): self.designation = designation self.salary = salary self.service_points = service_points self.joining_date = joining_date self.leaving_date = leaving_date - super().__init__(code, name, type, parent_ledger_id, is_active, costcenter_id) + super().__init__(code, name, 10, is_active, costcenter_id) def create(self): code = DBSession.query(func.max(LedgerBase.code)).filter(LedgerBase.type == self.type).one()[0] @@ -266,6 +265,11 @@ class Employee(LedgerBase): DBSession.add(self) return self + @classmethod + def list(cls): + return DBSession.query(Employee).order_by(desc(Employee.is_active)).order_by(Ledger.costcenter_id).order_by( + Employee.designation).order_by(Employee.name).all() + class Ledger(LedgerBase): __mapper_args__ = {'polymorphic_identity': ''} diff --git a/brewman/brewman/static/partial/account-detail.html b/brewman/brewman/static/partial/account-detail.html index 599794bd..baf3f151 100644 --- a/brewman/brewman/static/partial/account-detail.html +++ b/brewman/brewman/static/partial/account-detail.html @@ -1,52 +1,52 @@ -
- Account Detail -
- + + Account Detail +
+ -
- -
+
+
-
- +
+
+ -
- -
+
+
+
-
- +
+ -
- +
+ -
+
-
-
- -
+
+
+
+
-
- +
+ -
- +
+ -
+
-
+
-
- -
+
+
- +
+ diff --git a/brewman/brewman/static/partial/employee-detail.html b/brewman/brewman/static/partial/employee-detail.html new file mode 100644 index 00000000..df819f6e --- /dev/null +++ b/brewman/brewman/static/partial/employee-detail.html @@ -0,0 +1,77 @@ +
+ Employee Detail +
+ + +
+ +
+
+
+ + +
+ +
+
+
+ + +
+ +
+
+
+ + +
+ +
+
+
+ + +
+ +
+
+
+
+ +
+
+ +
+ + +
+ + +
+
+
+ + +
+ +
+
+ +
+ + +
+ +
+
+ +
+ +
+ +
+
+
diff --git a/brewman/brewman/static/partial/employee-list.html b/brewman/brewman/static/partial/employee-list.html new file mode 100644 index 00000000..f45d9dd6 --- /dev/null +++ b/brewman/brewman/static/partial/employee-list.html @@ -0,0 +1,28 @@ +Employees Add + + + + + + + + + + + + + + + + + + + + + + + + + + +
CodeNameDesignationSalaryService PointsDepartmentJoining DateLeaving Date
{{item.Code}}{{item.Name}}{{item.Designation}}{{item.Salary}}{{item.ServicePoints}}{{item.CostCenter}}{{item.JoiningDate}}{{item.LeavingDate}}
diff --git a/brewman/brewman/static/scripts/angular_service.js b/brewman/brewman/static/scripts/angular_service.js index c7017cb0..99b40727 100644 --- a/brewman/brewman/static/scripts/angular_service.js +++ b/brewman/brewman/static/scripts/angular_service.js @@ -21,6 +21,14 @@ overlord_service.factory('Account', ['$resource', function ($resource) { }); }]); +// TODO: Replace hardcoded url with route_url +overlord_service.factory('Employee', ['$resource', function ($resource) { + return $resource('/Employee/:id', + {id:'@LedgerID'}, { + query:{method:'GET', params:{list:true}, isArray:true} + }); +}]); + // TODO: Replace hardcoded url with route_url overlord_service.factory('Ledger', ['$resource', function ($resource) { return $resource('/Ledger/:id'); diff --git a/brewman/brewman/static/scripts/employee.js b/brewman/brewman/static/scripts/employee.js new file mode 100644 index 00000000..5da586fb --- /dev/null +++ b/brewman/brewman/static/scripts/employee.js @@ -0,0 +1,29 @@ +function EmployeeListCtrl($scope, Employee) { + $scope.info = Employee.query(); +} + +function EmployeeCtrl($scope, $routeParams, $location, Employee, CostCenter) { + $scope.employee = Employee.get({id: $routeParams.id}); + + $scope.cost_centers = CostCenter.query(); + + $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:'Error', 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:'Error', Message:data.data}); + }); + }; + $('#txtName').focus(); + +} diff --git a/brewman/brewman/static/scripts/overlord.js b/brewman/brewman/static/scripts/overlord.js index e158e795..174d0376 100644 --- a/brewman/brewman/static/scripts/overlord.js +++ b/brewman/brewman/static/scripts/overlord.js @@ -42,6 +42,10 @@ var overlord = angular.module('overlord', ['overlord.directive', 'overlord.filte when('/Account', {templateUrl:'/partial/account-detail.html', controller:AccountCtrl}). when('/Account/:id', {templateUrl:'/partial/account-detail.html', controller:AccountCtrl}). + when('/Employees', {templateUrl:'/partial/employee-list.html', controller:EmployeeListCtrl}). + when('/Employee', {templateUrl:'/partial/employee-detail.html', controller:EmployeeCtrl}). + when('/Employee/:id', {templateUrl:'/partial/employee-detail.html', controller:EmployeeCtrl}). + when('/CostCenters', {templateUrl:'/partial/cost-center-list.html', controller:CostCenterListCtrl}). when('/CostCenter', {templateUrl:'/partial/cost-center-detail.html', controller:CostCenterCtrl}). when('/CostCenter/:id', {templateUrl:'/partial/cost-center-detail.html', controller:CostCenterCtrl}). diff --git a/brewman/brewman/templates/angular_base.mako b/brewman/brewman/templates/angular_base.mako index 0fc02b8f..1e48fe78 100644 --- a/brewman/brewman/templates/angular_base.mako +++ b/brewman/brewman/templates/angular_base.mako @@ -46,6 +46,7 @@ ${h.ScriptLink(request, 'unposted.js')} ${h.ScriptLink(request, 'account.js')} + ${h.ScriptLink(request, 'employee.js')} ${h.ScriptLink(request, 'user.js')} ${h.ScriptLink(request, 'cost-center.js')} ${h.ScriptLink(request, 'product.js')} diff --git a/brewman/brewman/templates/employee/list.pt b/brewman/brewman/templates/employee/list.pt deleted file mode 100644 index 95f0ac71..00000000 --- a/brewman/brewman/templates/employee/list.pt +++ /dev/null @@ -1,44 +0,0 @@ - - -
-
-

Cost Centers

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
LedgerIDCodeNameDesignationIs Active?CostCenterIDCost CenterJoining DateLeaving Date
${item.id}${item.code}${item.name}${item.designation}${item.is_active}${item.costcenter_id}${item.costcenter.name}${'' if item.joining_date is None else item.joining_date.strftime('%d-%b-%Y')}${'' if item.leaving_date is None else item.leaving_date.strftime('%d-%b-%Y')}
- -
-
- - - \ No newline at end of file diff --git a/brewman/brewman/templates/nav_bar/employee.pt b/brewman/brewman/templates/nav_bar/employee.pt index 222d3ce5..a0a9bd95 100644 --- a/brewman/brewman/templates/nav_bar/employee.pt +++ b/brewman/brewman/templates/nav_bar/employee.pt @@ -1,8 +1,7 @@
  • Employees
      -
    • List
      • -
    • Add
      • +
    • Employees
    • Attendance
    • Employee Attendance
    • Attendance Record
      • diff --git a/brewman/brewman/views/blog.py.exclude b/brewman/brewman/views/blog.py.exclude deleted file mode 100644 index d2548008..00000000 --- a/brewman/brewman/views/blog.py.exclude +++ /dev/null @@ -1,60 +0,0 @@ -import transaction - -from brewman.models import DBSession - -from pyramid.view import view_config -from pyramid.response import Response - -from brewman.views.top_parts import slidernivo, breadcrumb, slider3d, slideraccordion, slidercarousel, sliderstatic, randomslider -from brewman.views.widgets import footer, widget_gallery, tweets, contact_widget, archive, categories, recent_posts, comments, blog_roll, events - -@view_config(route_name='blog', renderer='brewman:templates/blog.pt') -def blog(request): - return {'title':'Hops n Grains - Blog', - 'pageclass': "page-blog page-sidebar-right", - 'pagecontentclass': "page-content grid_8", - 'top_block': breadcrumb(request, "Blog", "A lot of interesting articles."), - 'widget1': tweets(request), - 'wid1': "grid_4", - 'widget2': categories(request), - 'wid2': "grid_4", - 'widget3': contact_widget(request), - 'wid3': "grid_4", - 'widget_comments': events(request), - 'widget_categories': categories(request), - 'widget_gallery': widget_gallery(request), - 'widget_archive': archive(request), - 'widget_blog_roll': blog_roll(request), - 'footer': footer(request)} - -@view_config(route_name='blog_post', renderer='brewman:templates/blog_post.pt') -def blog_post(request): - id = int(request.matchdict['id']) - dbsession = DBSession() - article = dbsession.query(Article).filter(Article.id==id).one() - return {'title':'Hops n Grains - Blog', - 'pageclass': "page-blogpost page-sidebar-right", - 'pagecontentclass': "page-content grid_8", - 'article': article, - 'top_block': breadcrumb(request, "Blog post", "This page shows you a blog post example."), - 'widget1': tweets(request), - 'wid1': "grid_4", - 'widget2': categories(request), - 'wid2': "grid_4", - 'widget3': contact_widget(request), - 'wid3': "grid_4", - 'footer': footer(request)} - -@view_config(route_name='blog_add', renderer='brewman:templates/blog_add.pt') -def blog_add(request): - return {'title':'Hops n Grains - Blog', - 'pageclass': "page-blogpost page-sidebar-right", - 'pagecontentclass': "page-content grid_8", - 'top_block': breadcrumb(request, "Blog post", "This page shows you a blog post example."), - 'widget1': tweets(request), - 'wid1': "grid_4", - 'widget2': categories(request), - 'wid2': "grid_4", - 'widget3': contact_widget(request), - 'wid3': "grid_4", - 'footer': footer(request)} diff --git a/brewman/brewman/views/employee.py b/brewman/brewman/views/employee.py index af1bef8e..0bf695f0 100644 --- a/brewman/brewman/views/employee.py +++ b/brewman/brewman/views/employee.py @@ -1,7 +1,6 @@ import datetime import uuid -from pyramid.httpexceptions import HTTPFound from pyramid.renderers import render from pyramid.security import authenticated_userid from pyramid.view import view_config @@ -10,80 +9,101 @@ import transaction from brewman.helpers import Literal from brewman.models import DBSession -from brewman.models.master import CostCenter, Employee, AttendanceType, LedgerType +from brewman.models.master import CostCenter, Employee, AttendanceType from brewman.models.validation_exception import ValidationError from brewman.models.voucher import Attendance -@view_config(request_method='GET', route_name='employee_id', renderer='brewman:templates/employee/edit.pt', +@view_config(route_name='employee_list', renderer='brewman:templates/angular_base.mako') +@view_config(request_method='GET', route_name='employee_id', renderer='brewman:templates/angular_base.mako', xhr=False, permission='EmployeesUpdate') -@view_config(request_method='GET', route_name='employee', renderer='brewman:templates/employee/edit.pt', - permission='EmployeesCreate') -def employee_edit(request): - id = request.matchdict.get('id', None) - if id is None: - item = Employee('(Auto)', '') - else: - item = Employee.by_id(uuid.UUID(id)) - print(item.code) - return {'title': 'Edit / Add Employee', - 'pageclass': "page-blogpost page-sidebar-right", - 'pagecontentclass': "page-content grid_12", - 'page_header': '', - 'item': item, - 'types': LedgerType.list(), - 'cost_centers': CostCenter.list()} +@view_config(request_method='GET', route_name='employee', renderer='brewman:templates/angular_base.mako', xhr=False, + permission='EmployeesUpdate') +def html(request): + return {} -@view_config(request_method='POST', route_name='employee_id', permission='EmployeesUpdate') -@view_config(request_method='POST', route_name='employee', permission='EmployeesCreate') -def employee_submit(request): +@view_config(request_method='POST', route_name='employee_id', renderer='json', xhr=True, permission='EmployeesUpdate') +@view_config(request_method='POST', route_name='employee', renderer='json', xhr=True, permission='EmployeesUpdate') +def save_update(request): try: id = request.matchdict.get('id', None) if id is None: - is_active = True if request.POST.has_key('is_active') else False - joining_date = datetime.datetime.strptime(request.POST['joining_date'], '%d-%b-%Y') - leaving_date = None if is_active else datetime.datetime.strptime(request.POST['leaving_date'], '%d-%b-%Y') - Employee(0, request.POST['name'], 10, None, is_active, uuid.UUID(request.POST['cost_center_id']), - request.POST['designation'], int(request.POST['salary']), int(request.POST['service_points']), + is_active = request.json_body['IsActive'] + joining_date = datetime.datetime.strptime(request.json_body['JoiningDate'], '%d-%b-%Y') + leaving_date = None if is_active else datetime.datetime.strptime(request.json_body['LeavingDate'], + '%d-%b-%Y') + + item = Employee(0, request.json_body['Name'], is_active, uuid.UUID(request.json_body['CostCenter']['CostCenterID']), + request.json_body['Designation'], int(request.json_body['Salary']), int(request.json_body['ServicePoints']), joining_date, leaving_date).create() - request.session.flash('Employee created') else: item = Employee.by_id(uuid.UUID(id)) - item.name = request.POST['name'] - item.is_active = True if request.POST.has_key('is_active') else False - item.costcenter_id = uuid.UUID(request.POST['cost_center_id']) - item.designation = request.POST['designation'] - item.salary = int(request.POST['salary']) - item.service_points = int(request.POST['service_points']) - item.joining_date = datetime.datetime.strptime(request.POST['joining_date'], '%d-%b-%Y') - item.leaving_date = None if item.is_active else datetime.datetime.strptime(request.POST['leaving_date'], + item.name = request.json_body['Name'] + item.is_active = request.json_body['IsActive'] + item.costcenter_id = uuid.UUID(request.json_body['CostCenter']['CostCenterID']) + item.designation = request.json_body['Designation'] + item.salary = int(request.json_body['Salary']) + item.service_points = int(request.json_body['ServicePoints']) + item.joining_date = datetime.datetime.strptime(request.json_body['JoiningDate'], '%d-%b-%Y') + item.leaving_date = None if item.is_active else datetime.datetime.strptime(request.json_body['LeavingDate'], '%d-%b-%Y') - request.session.flash('Employee Updated') transaction.commit() - url = request.route_url('employee_list') - return HTTPFound(location=url) + return employee_info(item.id) except ValidationError as ex: - request.session.flash(ex) transaction.abort() - request.session.flash(ex.message) - return request + response = Response("Failed validation: {0}".format(ex.message)) + response.status_int = 500 + return response -@view_config(route_name='employee_list', renderer='brewman:templates/employee/list.pt', permission='Employees') -def employee_list(request): - dbsession = DBSession() - list = dbsession.query(Employee)\ - .order_by(Employee.leaving_date)\ - .order_by(Employee.costcenter_id)\ - .order_by(Employee.designation)\ - .order_by(Employee.name)\ - .all() +@view_config(request_method='DELETE', route_name='employee_id', renderer='json', xhr=True) +def delete(request): + id = request.matchdict.get('id', None) + if id is None: + response = Response("Employee is Null") + response.status_int = 500 + return response + else: + response = Response("Employee deletion not implemented") + response.status_int = 500 + return response + + +@view_config(request_method='GET', route_name='employee_id', renderer='json', xhr=True) +@view_config(request_method='GET', route_name='employee', renderer='json', xhr=True) +def show(request): + list = request.GET.get('list', None) + + if list: + list = Employee.list() + ledgers = [] + for item in list: + ledgers.append( + {'Code': item.code, 'Name': item.name, 'Designation': item.designation, 'Salary': item.salary, + 'ServicePoints': item.service_points, 'IsActive': item.is_active, + 'CostCenter': item.costcenter.name, 'Url': request.route_url('employee_id', id=item.id), + 'JoiningDate': item.joining_date.strftime('%d-%b-%Y'), + 'LeavingDate': '' if item.is_active else item.leaving_date.strftime('%d-%b-%Y')}) + return ledgers + else: + id = request.matchdict.get('id', None) + id = None if id is None else uuid.UUID(id) + return employee_info(id) + + +def employee_info(id): + if id is None: + employee = {'Code': '(Auto)', 'IsActive': True, 'CostCenter': CostCenter.overall()} + else: + employee = Employee.by_id(id) + employee = {'LedgerID': employee.id, 'Code': employee.code, 'Name': employee.name, + 'IsActive': employee.is_active, 'Designation': employee.designation, 'Salary': employee.salary, + 'ServicePoints': employee.service_points, 'JoiningDate': employee.joining_date.strftime('%d-%b-%Y'), + 'LeavingDate': None if employee.is_active else employee.leaving_date.strftime('%d-%b-%Y'), + 'CostCenter': {'CostCenterID': employee.costcenter_id, 'Name': employee.costcenter.name}} + return employee + - return {'title': 'Employees', - 'pageclass': "page-blogpost page-sidebar-right", - 'pagecontentclass': "page-content grid_12", - 'page_header': '', - 'list': list} @view_config(request_method='GET', route_name='attendance_date', renderer='brewman:templates/employee/attendance.pt',