perbaikan base

opensipkd/base/scripts/data/groups.csv

-group_name,description
-"Superuser","Superuser"
-"Web Service","Webservice"
-"Pindah Departemen","Pindah Departemen"
-"Guest","Guest"
\ No newline at end of file
+group_name,description,member_count
+"Superuser","Superuser",0
+"Web Service","Webservice",0
+"Pindah Departemen","Pindah Departemen",0
+"Guest","Guest",0
\ No newline at end of file

opensipkd/base/scripts/initializedb.py

@@ -254,9 +254,8 @@ def append_csv(table, filename, keys, get_file_func=get_file,
 
 
             # Penambahan checking field nullable false wajib ada datanya 2024-09-05
             # Penambahan checking field nullable false wajib ada datanya 2024-09-05
             for c in columns_table:
             for c in columns_table:
-                if (not c["nullable"] and (c["name"] not in data or not data[c["name"]])
-                        and c["name"] != "id"):
-                    raise Exception(f"Field '{c['name']}' wajib ada {data}")
+                if (not c["nullable"] and c["name"] not in data  and c["name"] != "id"):
+                    raise Exception(f"Field '{c['name']}' wajib ada {c} ")
 
 
             db_session.add(row)
             db_session.add(row)
             db_session.flush()
             db_session.flush()

opensipkd/base/views/base_views.py

@@ -366,7 +366,7 @@ class BaseView(object):
                     output_file.write(data)
                     output_file.write(data)
                 output_file.close()
                 output_file.close()
                 try:
                 try:
-                    self.save_upload(fullpath, delimiter=delimiter, **args)
+                    self.save_upload(fullpath, **args)
                 except Exception as e:
                 except Exception as e:
                     self.req.session.flash(str(e), 'error')
                     self.req.session.flash(str(e), 'error')
                     return dict(form=form.render(),
                     return dict(form=form.render(),
@@ -384,9 +384,9 @@ class BaseView(object):
     def get_file(self, filename):
     def get_file(self, filename):
         return open(filename)
         return open(filename)
 
 
-    def save_upload(self, file_name, delimiter=",", **args):
+    def save_upload(self, file_name, **args):
         return append_csv(self.table, file_name, self.upload_keys,
         return append_csv(self.table, file_name, self.upload_keys,
-                          get_file_func=self.get_file, update_exist=True, delimiter=delimiter,
+                          get_file_func=self.get_file, update_exist=True,
                           **args)
                           **args)
 
 
     def before_add(self):
     def before_add(self):

opensipkd/base/views/departemen.py

@@ -29,7 +29,7 @@ def get_departemen_list():
 @colander.deferred
 @colander.deferred
 def departemen_widget(node, kw):
 def departemen_widget(node, kw):
     values = kw.get('departemen_list', [])
     values = kw.get('departemen_list', [])
-    return widget.Select2Widget(values=values)
+    return widget.Select2Widget(values=values, placeholder="Pilih Departemen")
 
 
 
 
 def departemen_widget_form():
 def departemen_widget_form():

opensipkd/models/users.py

@@ -30,6 +30,7 @@ class GroupPermission(GroupPermissionMixin, Base):
     pass
     pass
 
 
 
 
+
 class UserGroup(UserGroupMixin, Base, CommonModel):
 class UserGroup(UserGroupMixin, Base, CommonModel):
     @classmethod
     @classmethod
     def _get_by_user(cls, user):
     def _get_by_user(cls, user):
@@ -204,6 +205,7 @@ class Permission(Base, CommonModel):
 
 
 
 
 class Group(GroupMixin, Base, DefaultModel):
 class Group(GroupMixin, Base, DefaultModel):
+    member_count = Column(Integer, nullable=True, default=0)
     @classmethod
     @classmethod
     def query_group_name(cls, group_name):
     def query_group_name(cls, group_name):
         return DBSession.query(cls).filter_by(group_name=group_name)
         return DBSession.query(cls).filter_by(group_name=group_name)