Skip to content

aa.gusti / opensipkd-base

Go to a project
Commit 0ea7ef58 by Tatang S
Options

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

2 parents 7e0f33f3 3005a754
Expand all
Inline Side-by-side
Showing 12 changed files with 147 additions and 80 deletions
activate 0 → 120000
venv/bin/activate
\ No newline at end of file \ No newline at end of file
opensipkd/base/__init__.py
...@@ -150,6 +150,11 @@ def add_global(event): ...@@ -150,6 +150,11 @@ 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_params'] = get_params
def get_params(request, params, alternate=None, settings=None):
return get_params(params, alternate, settings)
def get_params(params, alternate=None, settings=None): def get_params(params, alternate=None, settings=None):
...@@ -162,7 +167,6 @@ def get_params(params, alternate=None, settings=None): ...@@ -162,7 +167,6 @@ def get_params(params, alternate=None, settings=None):
contoh penggunaan: contoh penggunaan:
get_params('devel', False) get_params('devel', False)
""" """
if not settings: if not settings:
settings = get_settings() settings = get_settings()
result = settings and params in settings and \ result = settings and params in settings and \
...@@ -175,6 +179,10 @@ def get_params(params, alternate=None, settings=None): ...@@ -175,6 +179,10 @@ def get_params(params, alternate=None, settings=None):
def get_ini(request, var): def get_ini(request, var):
return get_ini(var)
def get_ini(var):
settings = get_settings() settings = get_settings()
if var in settings and settings[var]: if var in settings and settings[var]:
return settings[var] return settings[var]
...@@ -497,6 +505,7 @@ def main(global_config, **settings): ...@@ -497,6 +505,7 @@ def main(global_config, **settings):
config.add_request_method(disable_responsive, 'disable_responsive', config.add_request_method(disable_responsive, 'disable_responsive',
reify=True) reify=True)
config.add_request_method(get_ini, 'get_ini', reify=True) config.add_request_method(get_ini, 'get_ini', reify=True)
config.add_request_method(get_params, 'get_params', reify=True)
config.add_request_method(get_csrf_token, 'get_csrf_token', reify=True) config.add_request_method(get_csrf_token, 'get_csrf_token', reify=True)
# config.add_translation_dirs('opensipkd.base:locale/') # config.add_translation_dirs('opensipkd.base:locale/')
......
opensipkd/base/static/js/form/departemen_form.js 0 → 100644
$(document).ready(function () {
$('#departemen_nm').bind('typeahead:selected', function (obj, datum, name) {
$('#departemen_id').val(datum.id);
$('#departemen_kd').val(datum.kode);
console.log(datum.kode);
});
$('#departemen_nm').on('input',
function (e) {
let val = $('#departemen_nm').val();
if (val === null || val === "") {
$('#departemen_id').val("");
$('#departemen_kd').val("");
}
});
});
\ No newline at end of file \ No newline at end of file
opensipkd/base/views/departemen.py
...@@ -35,6 +35,14 @@ def departemen_widget(node, kw): ...@@ -35,6 +35,14 @@ def departemen_widget(node, kw):
return widget.Select2Widget(values=values) return widget.Select2Widget(values=values)
def departemen_widget_form():
return widget.AutocompleteInputWidget(
size=60, min_length=3,
requirements=(("typeahead", None), ("deform", None),
{"js": "opensipkd.base:static/js/form/departemen_form.js"}),
)
class AddSchema(colander.Schema): class AddSchema(colander.Schema):
parent_id = colander.SchemaNode( parent_id = colander.SchemaNode(
colander.Integer(), colander.Integer(),
......
opensipkd/detable/detable.py
...@@ -114,6 +114,8 @@ class DeTable(field.Field): ...@@ -114,6 +114,8 @@ class DeTable(field.Field):
allow_edit=True, allow_edit=True,
allow_delete=True, allow_delete=True,
allow_view=True, allow_view=True,
allow_post=False,
allow_unpost=False,
**kw **kw
): ):
# field.Field.__init__(self, schema, **kw) # field.Field.__init__(self, schema, **kw)
...@@ -165,6 +167,8 @@ class DeTable(field.Field): ...@@ -165,6 +167,8 @@ class DeTable(field.Field):
self.allow_edit = json.dumps(allow_edit) self.allow_edit = json.dumps(allow_edit)
self.allow_delete = json.dumps(allow_delete) self.allow_delete = json.dumps(allow_delete)
self.allow_view = json.dumps(allow_view) self.allow_view = json.dumps(allow_view)
self.allow_post = json.dumps(allow_post)
self.allow_unpost = json.dumps(allow_unpost)
table_widget = getattr(schema, "widget", None) table_widget = getattr(schema, "widget", None)
if table_widget is None: if table_widget is None:
table_widget = widget.TableWidget() table_widget = widget.TableWidget()
......
opensipkd/detable/templates/detable.pt
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
allow_edit allow_edit|field.allow_edit; allow_edit allow_edit|field.allow_edit;
allow_delete allow_delete|field.allow_delete; allow_delete allow_delete|field.allow_delete;
allow_view allow_view|field.allow_view; allow_view allow_view|field.allow_view;
allow_post allow_post|field.allow_post;
allow_unpost allow_unpost|field.allow_unpost;
state_save state_save|field.state_save; state_save state_save|field.state_save;
" "
tal:attributes="style style; class css_class; attributes|field.widget.attributes|{};" tal:attributes="style style; class css_class; attributes|field.widget.attributes|{};"
...@@ -66,24 +68,31 @@ ...@@ -66,24 +68,31 @@
if (value === true) { if (value === true) {
return '<i class="fas fa-check-square" aria-hidden="true">'; return '<i class="fas fa-check-square" aria-hidden="true">';
} }
if (value === false) {
return 'Archived'; return 'Archived';
} }
return value;
}
function render_checklist(value) { function render_checklist(value) {
return '<input type="checkbox" checked="'+{value}+'"></input>'; return '<input type="checkbox" checked="' + {value} + '"></input>';
} }
for (let co in ${tableid}Columns) { for (let co in ${tableid}Columns) {
if (${tableid}Columns[co].checkbox === true) { if (${tableid}Columns[co].checkbox === true) {
${tableid}Columns[co].className = "text-center"; ${tableid}Columns[co].className = "text-center";
${tableid}Columns[co].width = "30pt"; ${tableid}Columns[co].width = "30pt";
${tableid}Columns[co].render = function (val) { ${tableid}Columns[co].render = function (value) {
if (["", false, 0].indexOf(val) === -1) { if (typeof value === "string" && value.length>0) {
return render_checkbox(value)
}
if (["", false, 0].indexOf(value) === -1) {
return render_checkbox(true); return render_checkbox(true);
} else return render_checkbox(false);
} }
return render_checkbox(false);
} }
else if (${tableid}Columns[co].hasOwnProperty("url")) { } else if (${tableid}Columns[co].hasOwnProperty("url")) {
let url = ${tableid}Columns[co].url; let url = ${tableid}Columns[co].url;
${tableid}Columns[co].render = function (data) { ${tableid}Columns[co].render = function (data) {
let result = "No Data" let result = "No Data"
...@@ -92,18 +101,23 @@ ...@@ -92,18 +101,23 @@
} }
return result; return result;
} }
} } else if (${tableid}Columns[co].data === "id" && ${tableid}Columns[co].action === true) {
else if (${tableid}Columns[co].data === "id" && ${tableid}Columns[co].action === true) {
${tableid}Columns[co].render = function (id) { ${tableid}Columns[co].render = function (id) {
let result = "" let result = ""
if (${allow_view}) { if (${allow_view}) {
result = '<a href="${url}/' + id + '/view"><i class="fas fa-eye" aria-hidden="true"></i></a>&nbsp;'; result = '<a href="${url}/' + id + '/view"><i class="fas fa-eye" aria-hidden="true" title="View"></i></a>&nbsp;';
} }
if (${allow_edit}) { if (${allow_edit}) {
result += '<a href="${url}/' + id + '/edit"><i class="fas fa-edit" aria-hidden="true"></i></a>&nbsp;' result += '<a href="${url}/' + id + '/edit"><i class="fas fa-edit" aria-hidden="true" title="Edit"></i></a>&nbsp;'
} }
if (${allow_delete}) { if (${allow_delete}) {
result += '<a href="${url}/' + id + '/delete"><i class="fas fa-trash" aria-hidden="true"></i></a>'; result += '<a href="${url}/' + id + '/delete"><i class="fas fa-trash" aria-hidden="true" title="Delete"></i></a>';
}
if (${allow_post}) {
result += '<a href="${url}/' + id + '/post"><i class="fas fa-signs-post" aria-hidden="true" title="Post"></i></a>';
}
if (${allow_unpost}) {
result += '<a href="${url}/' + id + '/unpost"><i class="fas fa-delete-left" aria-hidden="true" title="Unpost"></i></a>';
} }
return result; return result;
} }
...@@ -149,8 +163,7 @@ ...@@ -149,8 +163,7 @@
} }
if (!${server_side}) { if (!${server_side}) {
${tableid}Params.data = ${data}; ${tableid}Params.data = ${data};
} } else {
else {
${tableid}Params.ajax = o${tableid}Url; ${tableid}Params.ajax = o${tableid}Url;
} }
o${tableid} = $('#${tableid}').DataTable(${tableid}Params); o${tableid} = $('#${tableid}').DataTable(${tableid}Params);
......
opensipkd/models/base.py
from datetime import datetime from datetime import datetime
from opensipkd.tools import as_timezone
from sqlalchemy.ext.hybrid import hybrid_property
import ziggurat_foundations.models import ziggurat_foundations.models
from sqlalchemy.orm import (scoped_session, sessionmaker, Session)
from zope.sqlalchemy import register
from sqlalchemy import Column, String, SmallInteger, Integer, DateTime, func from sqlalchemy import Column, String, SmallInteger, Integer, DateTime, func
from sqlalchemy import inspect as sa_inspect from sqlalchemy import inspect as sa_inspect
from sqlalchemy.ext.hybrid import hybrid_property
from sqlalchemy.orm import (scoped_session, sessionmaker, Session)
from zope.sqlalchemy import register
from opensipkd.tools import as_timezone
class MySession(Session): class MySession(Session):
def execute(self, clause, params=None, mapper=None, **kw): def execute(self, clause, params=None, mapper=None, **kw):
# Your magic with clause here # Your magic with clause here
print("Session:", clause, params, mapper, kw) # print("Session:", clause, params, mapper, kw)
return Session.execute(self, clause, params) #, mapper return Session.execute(self, clause, params) # , mapper
session_factory = sessionmaker(class_=MySession) session_factory = sessionmaker(class_=MySession)
...@@ -60,9 +61,13 @@ class CommonModel(object): ...@@ -60,9 +61,13 @@ class CommonModel(object):
values[column.name] = value values[column.name] = value
return values return values
def from_dict(self, values): def from_dict(self, values, date_format="%d-%m-%Y"):
for column in self.__table__.columns: for column in self.__table__.columns:
if column.name in values: if column.name in values:
if type(column.type) == DateTime and date_format:
if values[column.name]:
setattr(self, column.name, datetime.strptime(values[column.name], date_format))
else:
setattr(self, column.name, values[column.name]) setattr(self, column.name, values[column.name])
def as_timezone(self, fieldname): def as_timezone(self, fieldname):
......
opensipkd/models/common.py
...@@ -51,5 +51,6 @@ class ResCompany(Base, NamaModel): ...@@ -51,5 +51,6 @@ class ResCompany(Base, NamaModel):
parent_id = Column(Integer, ForeignKey("company.id")) parent_id = Column(Integer, ForeignKey("company.id"))
children = relationship("ResCompany") children = relationship("ResCompany")
parent = relationship( parent = relationship(
"ResCompany", remote_side=[id], primaryjoin="ResCompany.parent_id==ResCompany.id" "ResCompany", remote_side=[id], primaryjoin="ResCompany.parent_id==ResCompany.id",
overlaps="children"
) )
opensipkd/models/departemen.py
...@@ -10,9 +10,10 @@ from sqlalchemy.orm import ( ...@@ -10,9 +10,10 @@ from sqlalchemy.orm import (
backref backref
) )
from . import ResCompany from . import ResCompany, DefaultModel, User
from ..models import DBSession, Base from ..models import DBSession, Base
from ..models import (NamaModel, from ..models import (
NamaModel,
TABLE_ARGS) TABLE_ARGS)
...@@ -57,59 +58,64 @@ class Departemen(Base, NamaModel): ...@@ -57,59 +58,64 @@ class Departemen(Base, NamaModel):
def get_list(cls): def get_list(cls):
return DBSession.query(cls.id, cls.nama).order_by(cls.nama).all() return DBSession.query(cls.id, cls.nama).order_by(cls.nama).all()
# class DepartemenUser(Base, DefaultModel):
# __tablename__ = 'departemen_user' class DepartemenUser(Base, DefaultModel):
# user_id = Column(Integer, ForeignKey(User.id), unique=True) __tablename__ = 'departemen_user'
# departemen_id = Column(Integer, ForeignKey(Departemen.id)) user_id = Column(Integer, ForeignKey(User.id), unique=True)
# sub_departemen = Column(SmallInteger, nullable=True) departemen_id = Column(Integer, ForeignKey(Departemen.id))
# departemen = relationship("Departemen", backref="user_departemen") sub_departemen = Column(SmallInteger, nullable=True)
# user = relationship("User", backref="user_departemen") departemen = relationship("Departemen", backref="user_departemen")
# __table_args__ = TABLE_ARGS user = relationship("User", backref="user_departemen")
# __table_args__ = TABLE_ARGS
# @classmethod
# def query_user_id(cls, user_id): @classmethod
# return DBSession.query(cls).filter_by(user_id=user_id) def query_user_id(cls, user_id):
# return DBSession.query(cls).filter_by(user_id=user_id)
# @classmethod
# def get_kode(cls, user_id): @classmethod
# row = cls.query_user_id(user_id).first() def get_kode(cls, user_id):
# return row and row.departemen.kode or None row = cls.query_user_id(user_id).first()
# return row and row.departemen.kode or None
# @classmethod
# def ids(cls, user_id): @classmethod
# r = () def ids(cls, user_id):
# departemens = DBSession.query(cls.departemen_id, cls.sub_departemen, Departemen.kode r = ()
# ).join(Departemen).filter(cls.departemen_id == Departemen.id, departemens = DBSession.query(cls.departemen_id, cls.sub_departemen, Departemen.kode
# cls.user_id == user_id).all() ).join(Departemen).filter(cls.departemen_id == Departemen.id,
# for departemen in departemens: cls.user_id == user_id).all()
# if departemen.sub_departemen: for departemen in departemens:
# rows = DBSession.query(Departemen.id).filter(Departemen.kode.ilike('%s%%' % departemen.kode)).all() if departemen.sub_departemen:
# else: rows = DBSession.query(Departemen.id).filter(
# rows = DBSession.query(Departemen.id).filter(Departemen.kode == departemen.kode).all() Departemen.kode.ilike('%s%%' % departemen.kode)).all()
# for i in range(len(rows)): else:
# r = r + (rows[i]) rows = DBSession.query(Departemen.id).filter(
# return r Departemen.kode == departemen.kode).all()
# for i in range(len(rows)):
# @classmethod r = r + (rows[i])
# def departemen_granted(cls, user_id, departemen_id): return r
# departemens = DBSession.query(cls.departemen_id, cls.sub_departemen, Departemen.kode
# ).join(Departemen).filter(cls.departemen_id == Departemen.id, @classmethod
# cls.user_id == user_id).all() def departemen_granted(cls, user_id, departemen_id):
# for departemen in departemens: departemens = DBSession.query(cls.departemen_id, cls.sub_departemen, Departemen.kode
# if departemen.sub_departemen: ).join(Departemen).filter(cls.departemen_id == Departemen.id,
# rows = DBSession.query(Departemen.id).filter(Departemen.kode.ilike('%s%%' % departemen.kode)).all() cls.user_id == user_id).all()
# else: for departemen in departemens:
# rows = DBSession.query(Departemen.id).filter(Departemen.kode == departemen.kode).all() if departemen.sub_departemen:
# for i in range(len(rows)): rows = DBSession.query(Departemen.id).filter(
# if int(rows[i][0]) == int(departemen_id): Departemen.kode.ilike('%s%%' % departemen.kode)).all()
# return True else:
# return False rows = DBSession.query(Departemen.id).filter(
# Departemen.kode == departemen.kode).all()
# @classmethod for i in range(len(rows)):
# def get_filtered(cls, request): if int(rows[i][0]) == int(departemen_id):
# filter = "'%s' LIKE public.departemens.kode||'%%'" % request.session['departemen_kd'] return True
# q1 = DBSession.query(Departemen.kode, UserDepartemen.sub_departemen).join(UserDepartemen). \ return False
# filter(UserDepartemen.user_id == request.user.id,
# UserDepartemen.departemen_id == Departemen.id, # @classmethod
# text(filter)) # def get_filtered(cls, request):
# return q1.first() # filter = "'%s' LIKE public.departemens.kode||'%%'" % request.session['departemen_kd']
# q1 = DBSession.query(Departemen.kode, UserDepartemen.sub_departemen).join(UserDepartemen). \
# filter(UserDepartemen.user_id == request.user.id,
# UserDepartemen.departemen_id == Departemen.id,
# text(filter))
# return q1.first()
opensipkd/models/users.py
...@@ -166,7 +166,8 @@ class User(UserMixin, BaseModel, DefaultModel, Base): ...@@ -166,7 +166,8 @@ class User(UserMixin, BaseModel, DefaultModel, Base):
class ExternalIdentity(ExternalIdentityMixin, CommonModel, Base): class ExternalIdentity(ExternalIdentityMixin, CommonModel, Base):
user = relationship(User, backref=backref("external")) user = relationship(User, backref=backref("external"),
overlaps="external_identities,owner")
@classmethod @classmethod
def query(cls): def query(cls):
......
setup.py
import os import os
from setuptools import setup, find_packages from setuptools import setup, find_packages
here = os.path.abspath(os.path.dirname(__file__)) here = os.path.abspath(os.path.dirname(__file__))
...@@ -15,6 +16,8 @@ requires = [ ...@@ -15,6 +16,8 @@ requires = [
'colander==1.8.3', 'colander==1.8.3',
'pyramid', 'pyramid',
'pyramid_tm', 'pyramid_tm',
"pyramid_beaker",
"pyramid_mailer",
'SQLAlchemy', 'SQLAlchemy',
'transaction', 'transaction',
'waitress', 'waitress',
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!