Skip to content

aa.gusti / opensipkd-base

Go to a project
Commit e926ff70 by aa.gustiana@gmail.com
Options

perbaikan base login

1 parent b6326cf6
Inline Side-by-side
Showing 4 changed files with 46 additions and 121 deletions
opensipkd/base/__init__.py
...@@ -153,7 +153,7 @@ def add_global(event): ...@@ -153,7 +153,7 @@ def add_global(event):
event['get_params'] = get_params event['get_params'] = get_params
event['get_urls'] = get_urls event['get_urls'] = get_urls
event['get_csrf_token'] = get_csrf_token event['get_csrf_token'] = get_csrf_token
event['get_base_menus'] = BASE_CLASS.get_menus() event['get_base_menus'] = BASE_CLASS.get_menus
# event['get_params'] = get_params # event['get_params'] = get_params
# event['get_module_menus'] = get_module_menus # event['get_module_menus'] = get_module_menus
# event['get_module_submenus'] = get_module_submenus # event['get_module_submenus'] = get_module_submenus
...@@ -523,10 +523,11 @@ def _add_view_config(config, paket, route): ...@@ -523,10 +523,11 @@ def _add_view_config(config, paket, route):
config.add_view(views, **params) config.add_view(views, **params)
except Exception as e: except Exception as e:
raise e _logging.error(f"Add View Config :")
_logging.error(f"Add View Config :" )
_logging.error(str(e)) _logging.error(str(e))
_logging.error(route) _logging.error(route)
raise e
# def add_view_config(config, module, view_name): # def add_view_config(config, module, view_name):
...@@ -747,6 +748,8 @@ class BaseApp(): ...@@ -747,6 +748,8 @@ class BaseApp():
def add_menu(self, config, route_menus, parent=None, paket="opensipkd.base.views"): def add_menu(self, config, route_menus, parent=None, paket="opensipkd.base.views"):
route_names = [] route_names = []
for route in route_menus: for route in route_menus:
if not int(route.get("status", 0)):
continue
route["route_names"] = [route["kode"]] route["route_names"] = [route["kode"]]
route["permission"] = route.get("permission", "") route["permission"] = route.get("permission", "")
route["icon"] = route.get("icon", None) route["icon"] = route.get("icon", None)
...@@ -787,6 +790,8 @@ class BaseApp(): ...@@ -787,6 +790,8 @@ class BaseApp():
rows = csv.DictReader(f) rows = csv.DictReader(f)
new_routes = [] new_routes = []
for row in rows: for row in rows:
if not int(row.get("status", 0)):
continue
row["children"] = [] row["children"] = []
if row.get("parent_id") or row.get("parent_id/routes.kode"): if row.get("parent_id") or row.get("parent_id/routes.kode"):
new_routes[len(new_routes)-1]["children"].append(row) new_routes[len(new_routes)-1]["children"].append(row)
...@@ -814,3 +819,7 @@ class BaseApp(): ...@@ -814,3 +819,7 @@ class BaseApp():
BASE_CLASS = BaseApp() BASE_CLASS = BaseApp()
@subscriber(BeforeRender)
def add_global(event):
event['get_base_menus'] = BASE_CLASS.get_menus()
\ No newline at end of file \ No newline at end of file
opensipkd/base/routes.py
# kode, path, nama # kode, path, nama
routes = [ routes = [
("user-area", "/user/area", "User Area"), # ("user-area", "/user/area", "User Area"),
("user-area-add", "/user/area/add", "Tambah User Area"), # ("user-area-add", "/user/area/add", "Tambah User Area"),
("user-area-edit", "/user/area/{id}/edit", "Edit User Area"), # ("user-area-edit", "/user/area/{id}/edit", "Edit User Area"),
("user-area-delete", "/user/area/{id}/delete", "Hapus User Area"), # ("user-area-delete", "/user/area/{id}/delete", "Hapus User Area"),
("user-area-view", "/user/area/{id}/view", "Lihat User Area"), # ("user-area-view", "/user/area/{id}/view", "Lihat User Area"),
("user-area-act", "/user/area/{act}/act", "Action User Area"), # ("user-area-act", "/user/area/{act}/act", "Action User Area"),
("user-area-upload", "/user/area/upload", "Upload User Area"), # ("user-area-upload", "/user/area/upload", "Upload User Area"),
("user-departemen", "/user/departemen", "User Departemen"), # ("user-departemen", "/user/departemen", "User Departemen"),
("user-departemen-add", "/user/departemen/add", "Tambah User Departemen"), # ("user-departemen-add", "/user/departemen/add", "Tambah User Departemen"),
("user-departemen-edit", # ("user-departemen-edit",
"/user/departemen/{id}/edit", "Edit User Departemen"), # "/user/departemen/{id}/edit", "Edit User Departemen"),
("user-departemen-delete", # ("user-departemen-delete",
"/user/departemen/{id}/delete", "Hapus User Departemen"), # "/user/departemen/{id}/delete", "Hapus User Departemen"),
("user-departemen-view", # ("user-departemen-view",
"/user/departemen/{id}/view", "Lihat User Departemen"), # "/user/departemen/{id}/view", "Lihat User Departemen"),
("user-departemen-act", # ("user-departemen-act",
"/user/departemen/{act}/act", "Action User Departemen"), # "/user/departemen/{act}/act", "Action User Departemen"),
("user-departemen-upload", "/user/departemen/upload", "Upload User Departemen"), # ("user-departemen-upload", "/user/departemen/upload", "Upload User Departemen"),
] ]
opensipkd/base/scripts/data/routes.csv
kode,path,nama,app_id,file_name,class_name,func_name,permission,parent_id,status,typ,is_menu,template kode,path,nama,app_id,file_name,class_name,func_name,permission,parent_id,status,typ,is_menu,template
home,/,0,,,,,,,1,0,, home,/,openSipkd,,,,,,,1,0,,
departemen,/departemen,Organisasi,,departemen,Views,view_list,admin,,1,0,1, departemen,/departemen,Organisasi,,departemen,Views,view_list,admin,,1,0,1,
departemen-act,/departemen/{act}/act,Organisasi Act,,departemen,,,admin,departemen,1,0,,json departemen-act,/departemen/{act}/act,Organisasi Act,,departemen,,,admin,departemen,1,0,,json
departemen-add,/departemen/add,Organisasi Tambah,,departemen,,,admin,departemen,1,0,, departemen-add,/departemen/add,Organisasi Tambah,,departemen,,,admin,departemen,1,0,,
...@@ -164,3 +164,17 @@ company-view,/company/{id}/view,Pemda View,,,,,,,1,0,, ...@@ -164,3 +164,17 @@ company-view,/company/{id}/view,Pemda View,,,,,,,1,0,,
company-delete,/company/{id}/delete,Pemda Hapus,,,,,,,1,0,, company-delete,/company/{id}/delete,Pemda Hapus,,,,,,,1,0,,
company-act,/company/{act}/act,Pemda Act,,,,,,,1,0,, company-act,/company/{act}/act,Pemda Act,,,,,,,1,0,,
company-rpt,/company/{rpt}/rpt,Pemda Report,,,,,,,1,0,, company-rpt,/company/{rpt}/rpt,Pemda Report,,,,,,,1,0,,
user-area, /user/area,User Area,,,,,,,1,0,,
user-area-add,/user/area/add,Tambah User Area,,,,,,,1,0,,
user-area-edit,/user/area/{id}/edit,Edit User Area,,,,,,,1,0,,
user-area-delete,/user/area/{id}/delete,Hapus User Area,,,,,,,1,0,,
user-area-view,/user/area/{id}/view,Lihat User Area,,,,,,,1,0,,
user-area-act,/user/area/{act}/act,Action User Area,,,,,,,1,0,,
user-area-upload,/user/area/upload,Upload User Area,,,,,,,1,0,,
user-departemen,/user/departemen,User Departemen,,,,,,,1,0,,
user-departemen-add,/user/departemen/add,Tambah User Departemen,,,,,,,1,0,,
user-departemen-edit,/user/departemen/{id}/edit,Edit User Departemen,,,,,,,1,0,,
user-departemen-delete,/user/departemen/{id}/delete,Hapus User Departemen,,,,,,,1,0,,
user-departemen-view,/user/departemen/{id}/view,Lihat User Departemen,,,,,,,1,0,,
user-departemen-act,/user/departemen/{act}/act,Action User Departemen,,,,,,,1,0,,
user-departemen-upload,/user/departemen/upload,Upload User Departemen,,,,,,,1,0,,
\ No newline at end of file \ No newline at end of file
opensipkd/base/views/departemen.py
...@@ -139,14 +139,7 @@ class AddSchema(colander.Schema): ...@@ -139,14 +139,7 @@ class AddSchema(colander.Schema):
def after_bind(self, schema, kwargs): def after_bind(self, schema, kwargs):
request = kwargs["request"] request = kwargs["request"]
self["parent_nm"].widget.values = f"{request.route_url('departemen')}/hon/act" self["parent_nm"].widget.values = f"{request.route_url('departemen-act', act='hon')}"
# self["parent_nm"].widget = widget.AutocompleteInputWidget(
# size=60, min_length=3,
# requirements=(("typeahead", None), ("deform", None),
# {"js": "opensipkd.base:static/js/form/departemen.js"}),
# values=f"{request.route_url('departemen')}/hon/act",
# )
if request.user.company_id: if request.user.company_id:
self["company_id"].widget = widget.HiddenWidget() self["company_id"].widget = widget.HiddenWidget()
self["company_id"].default = request.user.company_id self["company_id"].default = request.user.company_id
...@@ -242,18 +235,6 @@ class Views(BaseView): ...@@ -242,18 +235,6 @@ class Views(BaseView):
row = super().save_request(values, row) row = super().save_request(values, row)
return row return row
# @view_config(route_name='departemen-view',
# renderer='templates/form.pt',
# permission='departemen')
# def view_view(self):
# return super().view_view()
# @view_config(route_name='departemen',
# renderer='templates/table.pt',
# permission='departemen')
# def view_list(self):
# return super().view_list()
def list_join(self, query): def list_join(self, query):
query = query.outerjoin( query = query.outerjoin(
dep_alias, Departemen.parent_id == dep_alias.id)\ dep_alias, Departemen.parent_id == dep_alias.id)\
...@@ -262,8 +243,6 @@ class Views(BaseView): ...@@ -262,8 +243,6 @@ class Views(BaseView):
) )
return query return query
# @view_config(route_name='departemen-act', renderer='json',
# permission='view')
def view_act(self): def view_act(self):
request = self.req request = self.req
# ses = request.session # ses = request.session
...@@ -386,70 +365,9 @@ class Views(BaseView): ...@@ -386,70 +365,9 @@ class Views(BaseView):
def get_bindings(self, row=None): def get_bindings(self, row=None):
return {"company_list": ResCompany.get_list()} return {"company_list": ResCompany.get_list()}
# @view_config(route_name='departemen-add', renderer='templates/form.pt',
# permission='departemen')
# def view_add(self):
# return super().view_add()
# @view_config(route_name='departemen-edit',
# renderer='templates/form.pt', permission='departemen')
# def view_edit(self):
# return super().view_edit()
# @view_config(route_name='departemen-delete',
# renderer='templates/form.pt', permission='departemen')
# def view_delete(self):
# return super().view_delete()
# @view_config(route_name='departemen-upload',
# renderer='templates/form.pt',
# permission='departemen')
def view_upload(self): def view_upload(self):
return super().view_upload(exts=('.csv', '.tsv'), delimiter="\t") return super().view_upload(exts=('.csv', '.tsv'), delimiter="\t")
# request = self.req
# form = self.get_form(UploadSchema)
# if request.POST:
# if 'save' in request.POST:
# input_file = request.POST['upload'].file
# filename = request.POST['upload'].filename
# ext = get_ext(filename)
# if ext.lower() != '.csv':
# request.session.flash('File harus format csv', 'error')
# return dict(form=form.render())
# if not input_file:
# return dict(form=form.render())
# input_file.seek(0)
# temp_file_path = '/tmp/' + get_random_string(10) + '.csv'
#
# with open(temp_file_path, 'wb') as output_file:
# shutil.copyfileobj(input_file, output_file)
#
# with open(temp_file_path) as f:
# c = csv.DictReader(f)
# for csv_row in c:
# kode = csv_row['kode']
# if kode:
# xcode = kode.split(".")
# for r in range(len(xcode)):
# xc = xcode[r] and int(xcode[r])
# if not xc and type(xc) == int:
# code = ""
# for t in range(r):
# code += xcode[t] + '.'
#
# if code:
# code = code[:-1]
# self.save_upload(code, csv_row)
#
# self.save_upload(kode, csv_row)
#
# DBSession.flush()
# os.remove(temp_file_path)
#
# return self.route_list()
# return dict(form=form.render())
def get_values(self, row, values=None): def get_values(self, row, values=None):
if not values: if not values:
values = row.to_dict() values = row.to_dict()
...@@ -458,19 +376,3 @@ class Views(BaseView): ...@@ -458,19 +376,3 @@ class Views(BaseView):
values["parent_nm"] = parent.nama values["parent_nm"] = parent.nama
values["parent_kd"] = parent.kode values["parent_kd"] = parent.kode
return values return values
# def save_upload(self, kode, csv_row):
# row = Departemen.query_kode(kode).first()
# if not row:
# row = Departemen()
# row.created = datetime.now()
# row.create_uid = self.req.user.id
# row.level_id = kode.count('.') + 1
# row.status = 1
# else:
# row.updated = datetime.now()
# row.update_uid = self.req.user.id
# row.kode = kode
# row.nama = csv_row['nama']
# DBSession.add(row)
# return row
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!