harian

models/__init__.py

@@ -21,7 +21,8 @@ from sqlalchemy.orm import (
 from zope.sqlalchemy import ZopeTransactionExtension
 from zope.sqlalchemy import ZopeTransactionExtension
 
 
 from ...models import (CommonModel, DefaultModel as BaseDefaultModel,
 from ...models import (CommonModel, DefaultModel as BaseDefaultModel,
-                       Base as EisBase, DBSession as EisDBSession)
+                       Base as EisBase, DBSession as EisDBSession,
+                       KodeModel as BaseKodeModel, NamaModel as BaseNamaModel)
  
  
 TABLE_ARGS = {'extend_existing':True,
 TABLE_ARGS = {'extend_existing':True,
               'schema':'eis'
               'schema':'eis'
@@ -30,7 +31,6 @@ TABLE_ARGS = {'extend_existing':True,
 class DefaultModel(BaseDefaultModel):
 class DefaultModel(BaseDefaultModel):
     def save(self):
     def save(self):
         if self.id:
         if self.id:
-            #Who knows another user edited, so use merge ()
             EisDBSession.merge(self)
             EisDBSession.merge(self)
         else:
         else:
             EisDBSession.add(self)    
             EisDBSession.add(self)    
@@ -40,37 +40,13 @@ class DefaultModel(BaseDefaultModel):
         return EisDBSession.query(cls)
         return EisDBSession.query(cls)
 
 
     @classmethod
     @classmethod
-    def query_id(cls, id):
-        return cls.query().filter_by(id=id)
-        
-    @classmethod
-    def delete(cls, id):
-        cls.query_id(id).delete()
-    @classmethod
     def count(cls):
     def count(cls):
         return EisDBSession.query(func.count('id')).scalar()
         return EisDBSession.query(func.count('id')).scalar()
     
     
-class KodeModel(DefaultModel):
-    kode = Column(String(32))
-    status = Column(SmallInteger, nullable=False, default=0)
-    created  = Column(DateTime, nullable=True, default=datetime.utcnow)
-    updated  = Column(DateTime, nullable=True)
-    create_uid  = Column(Integer, nullable=True, default=1)
-    update_uid  = Column(Integer, nullable=True)
+class KodeModel(DefaultModel, BaseKodeModel):
+    pass
     
     
-    @classmethod
-    def query_kode(cls,kode):
-        return cls.query().filter_by(kode=kode)
-        
-    @classmethod
-    def get_active(cls):
-        return cls.query().filter_by(status=1).all()
+class NamaModel(KodeModel, BaseNamaModel):
+    pass
     
     
-class NamaModel(KodeModel):
-    nama = Column(String(128))
-
-    @classmethod
-    def query_nama(cls, nama):
-        return cls.query().filter_by(nama=nama)
-
 from .eis import Eis, Slide, Chart, ChartItem, EisParams, ArPayment, LastUpdate
 from .eis import Eis, Slide, Chart, ChartItem, EisParams, ArPayment, LastUpdate
\ No newline at end of file

models/eis.py

@@ -21,7 +21,7 @@ from sqlalchemy.orm import (
 from ..models import (EisDBSession, DefaultModel, EisBase, NamaModel, TABLE_ARGS)
 from ..models import (EisDBSession, DefaultModel, EisBase, NamaModel, TABLE_ARGS)
 
 
 class Eis(EisBase, NamaModel):
 class Eis(EisBase, NamaModel):
-    __tablename__ = 'wells'
+    __tablename__ = 'harian'
     tahun = Column(Integer)
     tahun = Column(Integer)
     amt_tahun = Column(BigInteger)
     amt_tahun = Column(BigInteger)
     amt_bulan = Column(BigInteger)
     amt_bulan = Column(BigInteger)