Skip to content

irul / opensipkd-base

Go to a project
Commit ee8de6ab by aa.gusti
Options

Merge branch 'master' of https://git.opensipkd.com/aa.gusti/opensipkd-base

2 parents 3bd3d623 91807abe
Expand all
Inline Side-by-side
Showing 8 changed files with 58 additions and 12 deletions
opensipkd/base/scripts/data/group_permission.csv
...@@ -4,6 +4,7 @@ group_id/groups.group_name,perm_name ...@@ -4,6 +4,7 @@ group_id/groups.group_name,perm_name
"Superuser","user-group" "Superuser","user-group"
"Superuser","upload-logo" "Superuser","upload-logo"
"Superuser","departemen" "Superuser","departemen"
"Superuser","partner-departemen"
"Superuser","partner" "Superuser","partner"
"Superuser","parameter" "Superuser","parameter"
"Superuser","permission" "Superuser","permission"
......
opensipkd/base/scripts/data/permissions.csv
...@@ -6,6 +6,7 @@ user-group,User Group ...@@ -6,6 +6,7 @@ user-group,User Group
edit-title,Edit Title edit-title,Edit Title
upload-logo,Upload Logo upload-logo,Upload Logo
departemen,Departemen departemen,Departemen
partner-departemen,Partner Departemen
partner,Partner partner,Partner
parameter,Parameter parameter,Parameter
permission,Permission permission,Permission
......
opensipkd/base/scripts/data/routes.csv
...@@ -77,9 +77,9 @@ partner-add,/partner/add,Partner Add ...@@ -77,9 +77,9 @@ partner-add,/partner/add,Partner Add
departemen,/departemen,Organisasi departemen,/departemen,Organisasi
departemen-act,/departemen/{act}/act,Organisasi Act departemen-act,/departemen/{act}/act,Organisasi Act
departemen-add,/departemen/add,Organisasi Tambah departemen-add,/departemen/add,Organisasi Tambah
departemen-edt,/departemen/{id}/edt,Organisasi Edit departemen-edit,/departemen/{id}/edit,Organisasi Edit
departemen-view,/departemen/{id}/view,Organisasi view departemen-view,/departemen/{id}/view,Organisasi view
departemen-del,/departemen/{id}/del,Organisasi Hapus departemen-delete,/departemen/{id}/delete,Organisasi Hapus
departemen-rpt,/departemen/{rpt}/rpt,Organisasi Report departemen-rpt,/departemen/{rpt}/rpt,Organisasi Report
departemen-chg,/departemen/chg,Ubah Organisasi departemen-chg,/departemen/chg,Ubah Organisasi
departemen-upload,/departemen/upload,Upload Departemen,1,0 departemen-upload,/departemen/upload,Upload Departemen,1,0
......
opensipkd/base/views/base_views.py
...@@ -192,7 +192,8 @@ class BaseView(object): ...@@ -192,7 +192,8 @@ class BaseView(object):
def get_values(self, row): def get_values(self, row):
d = row.to_dict() d = row.to_dict()
d["tanggal"] = dmy(row.tanggal) if 'tanggal' in d and d['tanggal']:
d["tanggal"] = dmy(row.tanggal)
return d return d
def view_edit(self): def view_edit(self):
......
opensipkd/base/views/templates/base3.1.pt
...@@ -58,7 +58,29 @@ ...@@ -58,7 +58,29 @@
<link href="${home}/static/css/custom.css" rel="stylesheet" type="text/css"> <link href="${home}/static/css/custom.css" rel="stylesheet" type="text/css">
<metal:css define-slot="css_files"></metal:css> <metal:css define-slot="css_files"></metal:css>
<style metal:define-slot="style"></style> <style metal:define-slot="style">
.twitter-typeahead{
font-size: 12px !important;
margin-bottom: 0;
width: 100%;
height: 26px;
position: absolute;
top: 0;
left: 0;
z-index:auto;
}
.twitter-typeahead .tt-query, .twitter-typeahead .tt-hint {
font-size: 12px !important;
margin-bottom: 0;
width: 100%;
height: 26px;
position: absolute;
top: 0;
left: 0;
z-index:auto;
}
</style>
</head> </head>
......
opensipkd/base/views/templates/base_list.pt
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
}); });
$("#btn_close").click(function () { $("#btn_close").click(function () {
window.location = '${home}pbb/master'; window.location = '${home}';
return false; return false;
}); });
......
opensipkd/base/views/unit.py
...@@ -84,11 +84,32 @@ class ViewDepartemen(BaseView): ...@@ -84,11 +84,32 @@ class ViewDepartemen(BaseView):
def __init__(self, request): def __init__(self, request):
super(ViewDepartemen, self).__init__(request) super(ViewDepartemen, self).__init__(request)
self.form_scripts = """ self.form_scripts = """
$('#parent_nm').bind('typeahead:selected', function(obj, datum) { $(document).ready(function () {
$('#parent_id').val(datum.id); $('#parent_nm').typeahead({
$('#parent_kd').val(datum.kode); "hint" : true,
"highlight": true,
});""" "minLength": 1,
"remote" : {
url: "/departemen/hon/act?term=%QUERY",
beforeSend: function () {
$('#parent_nm').addClass("loading");
},
filter: function(parsedResponse){
$('#parent_nm').removeClass('loading');
return parsedResponse;
}
},
},{
"name" : 'parent_nm',
"displayKey": 'value',
});
$('#parent_nm').bind('typeahead:selected', function(obj, datum, name) {
$('#parent_id').val(datum.id);
$('#parent_kd').val(datum.kode);
});
});
"""
self.list_col_defs = json.dumps( self.list_col_defs = json.dumps(
[{"searchable": False, "visible": False, "targets": [0], }, { [{"searchable": False, "visible": False, "targets": [0], }, {
...@@ -355,7 +376,7 @@ class ViewDepartemen(BaseView): ...@@ -355,7 +376,7 @@ class ViewDepartemen(BaseView):
######## ########
# Edit # # Edit #
######## ########
@view_config(route_name='departemen-edt', @view_config(route_name='departemen-edit',
renderer='templates/form_input.pt', permission='departemen') renderer='templates/form_input.pt', permission='departemen')
def view_edt(self): def view_edt(self):
request = self.req request = self.req
...@@ -381,7 +402,7 @@ class ViewDepartemen(BaseView): ...@@ -381,7 +402,7 @@ class ViewDepartemen(BaseView):
########## ##########
# Delete # # Delete #
########## ##########
@view_config(route_name='departemen-del', @view_config(route_name='departemen-delete',
renderer='templates/form_input.pt', permission='departemen') renderer='templates/form_input.pt', permission='departemen')
def view_delete(self): def view_delete(self):
request = self.req request = self.req
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!