Merge branch 'beta-4.2-training' of https://git.opensipkd.com/aa.gusti/opensipkd…

…-base into beta-4.2-training

opensipkd/base/reports/partnerdep1.jrxml

@@ -317,7 +317,7 @@
 					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 				</box>
 				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[new java.text.SimpleDateFormat("dd-MM-yyyy HH:mm:ss").format($F{selesai})]]></textFieldExpression>
+				<textFieldExpression><![CDATA[new java.text.SimpleDateFormat("dd-MM-yyyy").format($F{selesai})]]></textFieldExpression>
 			</textField>
 			</textField>
 			<textField>
 			<textField>
 				<reportElement x="270" y="0" width="110" height="30" uuid="5bb97ab5-46e6-40b4-902e-ae2b6e1d0468">
 				<reportElement x="270" y="0" width="110" height="30" uuid="5bb97ab5-46e6-40b4-902e-ae2b6e1d0468">
@@ -330,7 +330,7 @@
 					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 				</box>
 				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[new java.text.SimpleDateFormat("dd-MM-yyyy HH:mm:ss").format($F{mulai})]]></textFieldExpression>
+				<textFieldExpression><![CDATA[new java.text.SimpleDateFormat("dd-MM-yyyy").format($F{mulai})]]></textFieldExpression>
 			</textField>
 			</textField>
 			<textField>
 			<textField>
 				<reportElement x="40" y="0" width="230" height="30" uuid="626ff635-3856-435d-947d-56a952b300bc">
 				<reportElement x="40" y="0" width="230" height="30" uuid="626ff635-3856-435d-947d-56a952b300bc">

opensipkd/base/reports/users.jrxml

@@ -150,7 +150,7 @@ FROM users]]>
 					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 				</box>
 				</box>
 				<textElement textAlignment="Center"/>
 				<textElement textAlignment="Center"/>
-				<textFieldExpression><![CDATA[$F{last_login_date}== null ? " " : new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format($F{last_login_date})]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{last_login_date}== null ? " " : new java.text.SimpleDateFormat("dd-MM-yyyy HH:mm:ss").format($F{last_login_date})]]></textFieldExpression>
 			</textField>
 			</textField>
 			<textField>
 			<textField>
 				<reportElement x="355" y="0" width="54" height="20" uuid="47051f05-f634-4c32-97cc-ce9af7b8f382"/>
 				<reportElement x="355" y="0" width="54" height="20" uuid="47051f05-f634-4c32-97cc-ce9af7b8f382"/>

opensipkd/base/views/company.py

@@ -103,7 +103,9 @@ class ViewCompany(BaseView):
         self.edit_schema = EditSchema
         self.edit_schema = EditSchema
         self.list_schema = ListSchema
         self.list_schema = ListSchema
         self.table = ResCompany
         self.table = ResCompany
-        self.list_buttons = self.list_buttons + self.list_report + (button_import,)
+
+        # Cannot add new, use import method button
+        self.list_buttons = self.list_report + (button_import,)
 
 
         path = os.path.dirname(__file__)
         path = os.path.dirname(__file__)
         path = os.path.dirname(path)
         path = os.path.dirname(path)
@@ -195,7 +197,14 @@ class ViewCompany(BaseView):
         renderer='templates/table.pt',
         renderer='templates/table.pt',
         permission='company')
         permission='company')
     def view_list(self):
     def view_list(self):
-        return super().view_list()
+        # This view list cannot to save and updated
+        kwargs = {
+            "allow_view": True,
+            "allow_delete": False,
+            "allow_edit": False,
+            "state_save": False
+        }
+        return super().view_list(**kwargs)
 
 
     def filter_company(self, query):
     def filter_company(self, query):
         if self.req.user.company_id:
         if self.req.user.company_id: