coba ubah

opensipkd/base/views/base_views.py

@@ -106,21 +106,21 @@ class BaseView(object):
             'tahun_akhir'] or self.tahun_akhir
             'tahun_akhir'] or self.tahun_akhir
         self.ses['tahun_akhir'] = self.tahun_akhir
         self.ses['tahun_akhir'] = self.tahun_akhir
 
 
-        self.departemen_kd = 'departemen_kd' in self.ses and self.ses[
-            'departemen_kd'] or '0.0.00'
-        self.departemen_nm = 'departemen_nm' in self.ses and self.ses[
-            'departemen_nm'] or 'PILIH UNIT'
-        self.departemen_id = 'departemen_id' in self.ses and self.ses[
-            'departemen_id'] or 0
+        self.departemen_kd = self.ses.get('departemen_kd', '0.0.00')
+        self.departemen_nm = self.ses.get('departemen_nm', 'PILIH UNIT')
+        self.departemen_id = self.ses.get('departemen_id', 0)
+        
+        dep_id = self.params.get('departemen_id')
+        if dep_id:
+            try:
+                self.departemen_id = int(dep_id)
+            except:
+                self.departemen_id = 0
+        
         self.ses['departemen_kd'] = self.departemen_kd
         self.ses['departemen_kd'] = self.departemen_kd
         self.ses['departemen_nm'] = self.departemen_nm
         self.ses['departemen_nm'] = self.departemen_nm
         self.ses['departemen_id'] = self.departemen_id
         self.ses['departemen_id'] = self.departemen_id
-        if 'departemen_id' in self.params:
-            self.departemen_id = self.params['departemen_id']
-            if not self.departemen_id:
-                self.departemen_id = 0
 
 
-        self.ses["departemen_id"] = self.departemen_id
         self.jenis = 'jenis' in self.ses and self.ses['jenis'] or 0
         self.jenis = 'jenis' in self.ses and self.ses['jenis'] or 0
         self.jenis = 'jenis' in self.params and self.params[
         self.jenis = 'jenis' in self.params and self.params[
             'jenis'] or self.jenis
             'jenis'] or self.jenis