perbaikan maps.pt

opensipkd/base/alembic/versions/37ca8f816946_add_partner_id_to_user.py

+"""add partner_id to user
+
+Revision ID: 37ca8f816946
+Revises: 72dd62d47460
+Create Date: 2021-12-01 16:28:19.147741
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '37ca8f816946'
+down_revision = '72dd62d47460'
+branch_labels = None
+depends_on = None
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    context = op.get_context()
+    helpers = context.opts['helpers']
+    if not helpers.table_has_column('users', 'partner_id'):
+        op.add_column('users', sa.Column('partner_id', sa.Integer))
+
+
+def downgrade():
+    pass

opensipkd/base/models/accounting.py

+# from sqlalchemy import Column, Integer, SmallInteger, ForeignKey, UniqueConstraint, String
+# from sqlalchemy.orm import relationship, backref
+#
+# from . import Base, NamaModel, TABLE_ARGS
+#
+#
+# class Rekening(NamaModel, Base):
+#     __tablename__ = 'rekening'
+#     # level_id = Column(SmallInteger, default=1)
+#     parent_id = Column(Integer, ForeignKey('rekening.id'), )
+#     path = Column(String(255))
+#     status = Column(SmallInteger, default=1)
+#     category = Column(String(32))
+#     children = relationship(
+#         "Rekening", backref=backref('parent_id', remote_side='Rekening.id'))
+#     parent = relationship("Rekening", remote_side=[parent_id])
+#     __table_args__ = (
+#         UniqueConstraint('kode', name='rekening_uq'), TABLE_ARGS)
+#
+#     @classmethod
+#     def get_next_level(cls, cid):
+#         return cls.query_id(cid).first().level_id + 1

opensipkd/base/models/company.py

+from datetime import datetime
+
+from sqlalchemy import Column, String, Integer, ForeignKey
+
+from opensipkd.base.models import Kelurahan, Kecamatan, Kota, Provinsi
+from . import Partner
+from ..models import DBSession, Base
+from ..models import (NamaModel,
+                      TABLE_ARGS)
+
+
+class Company(Base, NamaModel):
+    __tablename__ = 'company'
+    kategori = Column(String(32))
+    partner_id = Column(Integer, ForeignKey(Partner.id))
+    logo = Column(String(255))
+    alamat = Column(String(255))
+    alamat2 = Column(String(255))
+    kelurahan_id = Column(Integer, ForeignKey(Kelurahan.id))
+    kecamatan_id = Column(Integer, ForeignKey(Kecamatan.id))
+    kota_id = Column(Integer, ForeignKey(Kota.id))
+    provinsi_id = Column(Integer, ForeignKey(Provinsi.id))
+    __table_args__ = (TABLE_ARGS,)
+
+    @classmethod
+    def save(cls, values, user, row=None, **kwargs):
+        if not row:
+            row = Company()
+            row.created = datetime.now()
+            row.create_uid = user.id
+
+        row.from_dict(values)
+        row.updated = datetime.now()
+        row.update_uid = user.id
+        row.status = 'status' in values and values['status'] and 1 or 0
+        DBSession.add(row)
+        DBSession.flush()
+        return row
+
+    @classmethod
+    def kategori_get(cls):
+        return (("kota", "Kota"),
+                ("kab", "Kabupaten"),
+                ("prov", "Provinsi"))

opensipkd/base/models/wilayah.py

+from sqlalchemy import (
+    Column,
+    Integer,
+    ForeignKey, UniqueConstraint, String
+)
+from sqlalchemy.orm import relationship
+
+from ..models import NamaModel, Base, TABLE_ARGS
+
+
+class Provinsi(Base, NamaModel):
+    __tablename__ = 'provinsi'
+    __table_args__ = (
+        UniqueConstraint('kode'),
+        TABLE_ARGS
+    )
+
+
+class Kota(Base, NamaModel):
+    __tablename__ = 'kota'
+    provinsi_id = Column(Integer, ForeignKey(Provinsi.id))
+    __table_args__ = (
+        UniqueConstraint('provinsi_id', 'kode'),
+        TABLE_ARGS
+    )
+    provinsi = relationship('Provinsi', backref='kota')
+
+
+class Kecamatan(Base, NamaModel):
+    __tablename__ = 'kecamatan'
+    kota_id = Column(Integer, ForeignKey(Kota.id))
+    __table_args__ = (
+        UniqueConstraint('kota_id', 'kode'),
+        TABLE_ARGS
+    )
+    kota = relationship('Kota', backref='kecamatan')
+
+
+class Kelurahan(Base, NamaModel):
+    __tablename__ = 'kelurahan'
+    kecamatan_id = Column(Integer, ForeignKey(Kecamatan.id))
+    __table_args__ = (
+        UniqueConstraint('kecamatan_id', 'kode'),
+        TABLE_ARGS
+    )
+    kecamatan = relationship('Kecamatan', backref='kelurahan')
+
+class AlamatModel(object):
+    alamat = Column(String(255))
+    alamat2 = Column(String(255))
+    kelurahan_id = Column(Integer, ForeignKey(Kelurahan.id))
+    kecamatan_id = Column(Integer, ForeignKey(Kecamatan.id))
+    kota_id = Column(Integer, ForeignKey(Kota.id))
+    provinsi_id = Column(Integer, ForeignKey(Provinsi.id))

opensipkd/base/views/templates/maps.pt

@@ -11,7 +11,7 @@
   <link rel="shortcut icon" href="${home}static/img/favicon.png">
   <link rel="shortcut icon" href="${home}static/img/favicon.png">
   <title tal:content="request.title"/>
   <title tal:content="request.title"/>
   <link rel="stylesheet" type="text/css"
   <link rel="stylesheet" type="text/css"
-        href="${home}static/bootstrap/css/bootstrap.min.css">
+        href="${home}static/v3/css/bootstrap.min.css">
   </link>
   </link>
   <link rel="stylesheet" type="text/css"
   <link rel="stylesheet" type="text/css"
         href="${home}static/bootstrap/css/font-awesome.min.css"/>
         href="${home}static/bootstrap/css/font-awesome.min.css"/>
@@ -134,9 +134,9 @@ var gmapKey = '${request.gmap_key}';
   </div>
   </div>
 </div>
 </div>
 <script type="text/javascript"
 <script type="text/javascript"
-        src="${home}static/jquery/jquery.min.js"></script>
+        src="${home}static/v3/js/jquery-2.1.1.min.js"></script>
 <script type="text/javascript"
 <script type="text/javascript"
-        src="${home}static/bootstrap/js/bootstrap.min.js"></script>
+        src="${home}static/v3/js/bootstrap/bootstrap.min.js"></script>
 <script type="text/javascript"
 <script type="text/javascript"
         src="${home}deform_static/scripts/typeahead.min.js"></script>
         src="${home}deform_static/scripts/typeahead.min.js"></script>