Merge pull request #409 from devgateway/develop

Develop into master berore 1.5.0
devgateway · Dec 4, 2019 · 8d73edc · 8d73edc
2 parents 3e68083 + c2acd2e
commit 8d73edc
Show file tree

Hide file tree

Showing 44 changed files with 2,500 additions and 2,032 deletions.
diff --git a/forms/pom.xml b/forms/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.devgateway.toolkit</groupId>
         <artifactId>makueni</artifactId>
-        <version>1.4.1-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -44,19 +44,19 @@
         <dependency>
             <groupId>org.devgateway.toolkit</groupId>
             <artifactId>persistence</artifactId>
-            <version>1.4.1-SNAPSHOT</version>
+            <version>1.5.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.devgateway.toolkit</groupId>
             <artifactId>persistence-mongodb</artifactId>
-            <version>1.4.1-SNAPSHOT</version>
+            <version>1.5.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.devgateway.toolkit</groupId>
             <artifactId>ui</artifactId>
-            <version>1.4.1-SNAPSHOT</version>
+            <version>1.5.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -95,7 +95,7 @@
         <dependency>
             <groupId>org.devgateway.toolkit</groupId>
             <artifactId>web</artifactId>
-            <version>1.4.1-SNAPSHOT</version>
+            <version>1.5.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>

diff --git a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/BasePage.html b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/BasePage.html
@@ -3,7 +3,8 @@
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1">
-        <title>Makueni</title>
+        <link rel="icon" href="ui/assets/favicon-32x32.ico" sizes="32x32" type="image/x-icon"/>
+        <title>Government of Makueni County Open Contracting Portal</title>
     </head>
     <body>
         <wicket:container wicket:id="scripts-container"/>

diff --git a/persistence-mongodb/pom.xml b/persistence-mongodb/pom.xml
@@ -31,14 +31,14 @@
     <parent>
         <groupId>org.devgateway.toolkit</groupId>
         <artifactId>makueni</artifactId>
-        <version>1.4.1-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>org.devgateway.toolkit</groupId>
             <artifactId>persistence</artifactId>
-            <version>1.4.1-SNAPSHOT</version>
+            <version>1.5.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>

diff --git a/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/MakueniPlanning.java b/persistence-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/MakueniPlanning.java
@@ -22,6 +22,20 @@ public class MakueniPlanning extends Planning {
             + " Items should not be duplicated, but a quantity of 2 specified instead.")
     private Set<Item> items = new LinkedHashSet<>();
 
+    @JsonProperty("fiscalYear")
+    @ExcelExport
+    @JsonPropertyDescription("Allowing Fiscal Year under Planning")
+    private String fiscalYear;
+
+
+    public String getFiscalYear() {
+        return fiscalYear;
+    }
+
+    public void setFiscalYear(String fiscalYear) {
+        this.fiscalYear = fiscalYear;
+    }
+
     public Set<Item> getItems() {
         return items;
     }

diff --git a/...mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/constants/MongoConstants.java b/...mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/constants/MongoConstants.java
@@ -27,6 +27,7 @@ public static final class FieldNames {
         public static final String BUYER_ID = "buyer._id";
         public static final String BUYER_NAME = "buyer.name";
         public static final String AWARDS_DATE = "awards.date";
+        public static final String PLANNING_FISCAL_YEAR = "planning.fiscalYear";
         public static final String AWARDS_FIRST_TIME_WINNER = "awards.firstTimeWinner";
         public static final String AWARDS_STATUS = "awards.status";
         public static final String AWARDS_SUPPLIERS_ID = "awards.suppliers._id";
@@ -65,6 +66,8 @@ public static final class Filters {
 
         public static final String AWARD_STATUS = "awardStatus";
 
+        public static final String FISCAL_YEAR = "fiscalYear";
+
         public static final String TENDER_STATUS = "tenderStatus";
 
         public static final String BID_TYPE_ID = "bidTypeId";

diff --git a/...a/org/devgateway/toolkit/persistence/mongo/spring/AbstractMongoDatabaseConfiguration.java b/...a/org/devgateway/toolkit/persistence/mongo/spring/AbstractMongoDatabaseConfiguration.java
@@ -90,6 +90,8 @@ public void createPostImportStructures() {
                 .ensureIndex(new Index().on(MongoConstants.FieldNames.AWARDS_SUPPLIERS_NAME, Direction.ASC));
         getTemplate().indexOps(Release.class)
                 .ensureIndex(new Index().on(MongoConstants.FieldNames.AWARDS_DATE, Direction.ASC));
+        getTemplate().indexOps(Release.class)
+                .ensureIndex(new Index().on(MongoConstants.FieldNames.PLANNING_FISCAL_YEAR, Direction.ASC));
         getTemplate().indexOps(Release.class)
                 .ensureIndex(new Index().on(MongoConstants.FieldNames.AWARDS_FIRST_TIME_WINNER, Direction.ASC));
         getTemplate().indexOps(Release.class)

diff --git a/persistence-mongodb/src/main/resources/extensions/fiscal_year/README.md b/persistence-mongodb/src/main/resources/extensions/fiscal_year/README.md
@@ -0,0 +1,21 @@
+# Fiscal Year
+
+Allowing Fiscal Year under Planning
+
+```
+{
+  "definitions": {
+    "Planning": {
+      "properties": {
+        "fiscalYear": {
+          "title": "Fiscal Year",
+          "type": [
+            "string",
+            "null"
+          ]
+        }
+      }
+    }
+  }
+}
+```
diff --git a/persistence-mongodb/src/main/resources/extensions/fiscal_year/extension.json b/persistence-mongodb/src/main/resources/extensions/fiscal_year/extension.json
@@ -0,0 +1,17 @@
+{
+  "name": {
+    "en": "Fiscal Year"
+  },
+  "description": {
+    "en": "Allowing Fiscal Year under Planning"
+  },
+  "documentationUrl": {
+    "en": "https://github.com/devgateway/forms-makueni/tree/master/persistence-mongodb/src/main/resources/extensions/fiscal_year"
+  },
+  "compatibility": [
+    "1.1"
+  ],
+  "schemas": [
+    "release-schema.json"
+  ]
+}
diff --git a/persistence-mongodb/src/main/resources/extensions/fiscal_year/release-schema.json b/persistence-mongodb/src/main/resources/extensions/fiscal_year/release-schema.json
@@ -0,0 +1,15 @@
+{
+  "definitions": {
+    "Planning": {
+      "properties": {
+        "fiscalYear": {
+          "title": "Fiscal Year",
+          "type": [
+            "string",
+            "null"
+          ]
+        }
+      }
+    }
+  }
+}
diff --git a/persistence/pom.xml b/persistence/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.devgateway.toolkit</groupId>
         <artifactId>makueni</artifactId>
-        <version>1.4.1-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/persistence/src/main/resources/ehcache.xml b/persistence/src/main/resources/ehcache.xml
@@ -25,6 +25,13 @@
            diskExpiryThreadIntervalSeconds="120"
     />
 
+    <cache name="fiscalYearsJson" eternal="true" statistics="true" maxEntriesLocalHeap="1000"
+           overflowToDisk="true"
+           maxElementsOnDisk="10000000"
+           diskPersistent="true"
+           diskExpiryThreadIntervalSeconds="120"
+    />
+
     <cache name="genericPagingRequestJson" eternal="true" statistics="true" maxEntriesLocalHeap="10000"
            overflowToDisk="true"
            maxElementsOnDisk="10000000"

diff --git a/persistence/src/main/resources/liquibase-changelog.xml b/persistence/src/main/resources/liquibase-changelog.xml
@@ -580,4 +580,35 @@
         </sql>
     </changeSet>
 
+    <changeSet id="OCMAKU-448" author="mpostelnicu">
+        <preConditions onFail="CONTINUE">
+            <tableExists tableName="CATEGORY"/>
+        </preConditions>
+        <insert tableName="CATEGORY">
+            <column name="ID" valueComputed="nextval('hibernate_sequence')"/>
+            <column name="LABEL" value="Framework Agreement"/>
+            <column name="DTYPE" value="ProcurementMethod"/>
+        </insert>
+        <insert tableName="CATEGORY">
+            <column name="ID" valueComputed="nextval('hibernate_sequence')"/>
+            <column name="LABEL" value="Two-stage Tendering"/>
+            <column name="DTYPE" value="ProcurementMethod"/>
+        </insert>
+        <insert tableName="CATEGORY">
+            <column name="ID" valueComputed="nextval('hibernate_sequence')"/>
+            <column name="LABEL" value="Design Competition"/>
+            <column name="DTYPE" value="ProcurementMethod"/>
+        </insert>
+        <insert tableName="CATEGORY">
+            <column name="ID" valueComputed="nextval('hibernate_sequence')"/>
+            <column name="LABEL" value="Force Account"/>
+            <column name="DTYPE" value="ProcurementMethod"/>
+        </insert>
+        <insert tableName="CATEGORY">
+            <column name="ID" valueComputed="nextval('hibernate_sequence')"/>
+            <column name="LABEL" value="Electronic Reverse Auction"/>
+            <column name="DTYPE" value="ProcurementMethod"/>
+        </insert>
+    </changeSet>
+
 </databaseChangeLog>
diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.devgateway.toolkit</groupId>
     <artifactId>makueni</artifactId>
-    <version>1.4.1-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Makueni</name>
     <description>DG Toolkit archetype - quick and easy way to start new projects through a working template

diff --git a/ui/assets/favicon-32x32.ico b/ui/assets/favicon-32x32.ico
diff --git a/ui/dev.html b/ui/dev.html
@@ -2,9 +2,10 @@
 <html lang="en">
 <head>
   <meta charset="UTF-8">
-  <title>OC Explorer</title>
+  <title>Government of Makueni County Open Contracting Portal</title>
   <link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap.min.css"/>
   <link rel="stylesheet" href="node_modules/leaflet/dist/leaflet.css">
+  <link rel="icon" href="assets/favicon-32x32.ico" sizes="32x32" type="image/x-icon">
 </head>
 <body>
 <div id="dg-container"></div>