ask4abid · ask4abid · Dec 30, 2020 · Dec 30, 2020
diff --git a/.jhipster/CollectionTracking.json b/.jhipster/CollectionTracking.json
@@ -0,0 +1,110 @@
+{
+  "name": "CollectionTracking",
+  "fields": [
+    {
+      "fieldName": "employeeID",
+      "fieldType": "String",
+      "fieldValidateRules": ["required"]
+    },
+    {
+      "fieldName": "unitID",
+      "fieldType": "String",
+      "fieldValidateRules": ["required"]
+    },
+    {
+      "fieldName": "employeeName",
+      "fieldType": "String",
+      "fieldValidateRules": ["required"]
+    },
+    {
+      "fieldName": "businessProposal",
+      "fieldType": "String",
+      "fieldValidateRules": ["required"]
+    },
+    {
+      "fieldName": "subProposal",
+      "fieldType": "String",
+      "fieldValidateRules": ["required"]
+    },
+    {
+      "fieldName": "mobileNo",
+      "fieldType": "String",
+      "fieldValidateRules": ["required"]
+    },
+    {
+      "fieldName": "relationId",
+      "fieldType": "String",
+      "fieldValidateRules": ["required"]
+    },
+    {
+      "fieldName": "accountNo",
+      "fieldType": "String",
+      "fieldValidateRules": ["required"]
+    },
+    {
+      "fieldName": "accountTitle",
+      "fieldType": "String",
+      "fieldValidateRules": ["required"]
+    },
+    {
+      "fieldName": "noOfVisits",
+      "fieldType": "Integer",
+      "fieldValidateRules": ["required"]
+    },
+    {
+      "fieldName": "osAmount",
+      "fieldType": "BigDecimal",
+      "fieldValidateRules": ["required"]
+    },
+    {
+      "fieldName": "osProfit",
+      "fieldType": "BigDecimal",
+      "fieldValidateRules": ["required"]
+    },
+    {
+      "fieldName": "odDays",
+      "fieldType": "String",
+      "fieldValidateRules": ["required"]
+    },
+    {
+      "fieldName": "loanOfficer",
+      "fieldType": "String",
+      "fieldValidateRules": ["required"]
+    },
+    {
+      "fieldName": "visitedBy",
+      "fieldType": "String",
+      "fieldValidateRules": ["required"]
+    },
+    {
+      "fieldName": "pptDate",
+      "fieldType": "LocalDate",
+      "fieldValidateRules": ["required"]
+    },
+    {
+      "fieldName": "remakrs",
+      "fieldType": "String",
+      "fieldValidateRules": ["required"]
+    }
+  ],
+  "relationships": [
+    {
+      "relationshipType": "many-to-one",
+      "otherEntityName": "employee",
+      "otherEntityRelationshipName": "collectionTracking",
+      "relationshipName": "employee",
+      "otherEntityField": "id"
+    }
+  ],
+  "changelogDate": "20201230155337",
+  "entityTableName": "collection_tracking",
+  "dto": "no",
+  "pagination": "no",
+  "service": "no",
+  "jpaMetamodelFiltering": false,
+  "fluentMethods": true,
+  "readOnly": false,
+  "embedded": false,
+  "clientRootFolder": "",
+  "applications": ["CCWApplication"]
+}
diff --git a/.jhipster/Employee.json b/.jhipster/Employee.json
@@ -0,0 +1,53 @@
+{
+  "name": "Employee",
+  "fields": [
+    {
+      "fieldName": "employeeID",
+      "fieldType": "String",
+      "fieldValidateRules": ["required"]
+    },
+    {
+      "fieldName": "unitID",
+      "fieldType": "String",
+      "fieldValidateRules": ["required"]
+    },
+    {
+      "fieldName": "firstName",
+      "fieldType": "String",
+      "fieldValidateRules": ["required"]
+    },
+    {
+      "fieldName": "lastName",
+      "fieldType": "String",
+      "fieldValidateRules": ["required"]
+    },
+    {
+      "fieldName": "emailAddress",
+      "fieldType": "String",
+      "fieldValidateRules": ["required"]
+    },
+    {
+      "fieldName": "login",
+      "fieldType": "String"
+    }
+  ],
+  "relationships": [
+    {
+      "relationshipType": "one-to-many",
+      "otherEntityName": "collectionTracking",
+      "otherEntityRelationshipName": "employee",
+      "relationshipName": "collectionTracking"
+    }
+  ],
+  "changelogDate": "20201230155237",
+  "entityTableName": "employee",
+  "dto": "no",
+  "pagination": "no",
+  "service": "no",
+  "jpaMetamodelFiltering": false,
+  "fluentMethods": true,
+  "readOnly": false,
+  "embedded": false,
+  "clientRootFolder": "",
+  "applications": ["CCWApplication"]
+}
diff --git a/.yo-rc.json b/.yo-rc.json
@@ -2,10 +2,10 @@
   "generator-jhipster": {
     "applicationType": "monolith",
     "gitCompany": "",
-    "baseName": "CollectionTrackingApplication",
-    "packageName": "com.finca.ccwapp",
-    "packageFolder": "com/finca/ccwapp",
-    "serverPort": 8080,
+    "baseName": "CCWApplication",
+    "packageName": "com.finca.ccw",
+    "packageFolder": "com/finca/ccw",
+    "serverPort": "8080",
     "serviceDiscoveryType": false,
     "authenticationType": "jwt",
     "uaaBaseName": "../uaa",
@@ -21,10 +21,10 @@
     "buildTool": "maven",
     "useSass": true,
     "clientPackageManager": "npm",
-    "testFrameworks": ["cucumber"],
+    "testFrameworks": [],
     "enableTranslation": true,
     "nativeLanguage": "en",
-    "languages": ["en"],
+    "languages": ["en", "fr"],
     "clientFramework": "angularX",
     "jhiPrefix": "jhi",
     "jhipsterVersion": "6.10.5",
@@ -36,9 +36,14 @@
     "dtoSuffix": "DTO",
     "otherModules": [],
     "blueprints": [],
-    "prettierJava": true
+    "prettierJava": true,
+    "skipUserManagement": false,
+    "skipClient": false,
+    "skipServer": false,
+    "clientThemeVariant": ""
   },
   "git-provider": "GitHub",
   "git-company": "ask4abid",
-  "repository-name": "Collection-application"
+  "repository-name": "Collection-application",
+  "entities": ["Employee", "CollectionTracking"]
 }
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# CollectionTrackingApplication
+# CCWApplication
 
 This application was generated using JHipster 6.10.5, you can find documentation and help at [https://www.jhipster.tech/documentation-archive/v6.10.5](https://www.jhipster.tech/documentation-archive/v6.10.5).
 
@@ -106,7 +106,7 @@ update src/main/webapp/app/app.module.ts
 
 ### Packaging as jar
 
-To build the final jar and optimize the CollectionTrackingApplication application for production, run:
+To build the final jar and optimize the CCWApplication application for production, run:
 
 ```
 

diff --git a/angular.json b/angular.json
@@ -3,7 +3,7 @@
   "version": 1,
   "newProjectRoot": "projects",
   "projects": {
-    "collection-tracking-application": {
+    "ccw-application": {
       "root": "",
       "sourceRoot": "src/main/webapp",
       "projectType": "application",
@@ -29,7 +29,7 @@
       "architect": {}
     }
   },
-  "defaultProject": "collection-tracking-application",
+  "defaultProject": "ccw-application",
   "cli": {
     "packageManager": "npm"
   }

diff --git a/ccwapp.jh b/ccwapp.jh
@@ -0,0 +1,48 @@
+
+application {
+  config {
+    baseName CCWApplication,
+    applicationType monolith,
+    packageName com.finca.ccw,
+    authenticationType jwt,
+    prodDatabaseType mysql,
+    clientFramework angular
+  }
+  entities *
+}
+
+entity Employee {
+  EmployeeID String required
+  UnitID String required
+  FirstName String required
+  LastName String required
+  EmailAddress String required
+  Login String 
+}
+
+entity CollectionTracking {
+  EmployeeID String required
+  UnitID String required
+  EmployeeName String required
+  BusinessProposal String required
+  SubProposal String required
+  MobileNo String required
+  RelationId String required
+  AccountNo String required
+  AccountTitle String required
+  NoOfVisits  Integer required
+  OsAmount BigDecimal required
+  OsProfit BigDecimal required
+  OdDays  String required
+  LoanOfficer String required
+  VisitedBy String required
+  PptDate  LocalDate required
+  Remakrs String required
+
+
+}
+
+relationship OneToMany {
+  Employee to CollectionTracking
+}
+
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "collection-tracking-application",
+  "name": "ccw-application",
   "version": "0.0.1-SNAPSHOT",
-  "description": "Description for CollectionTrackingApplication",
+  "description": "Description for CCWApplication",
   "private": true,
   "license": "UNLICENSED",
   "cacheDirectories": [

diff --git a/pom.xml b/pom.xml
@@ -3,11 +3,11 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.finca.ccwapp</groupId>
-    <artifactId>collection-tracking-application</artifactId>
+    <groupId>com.finca.ccw</groupId>
+    <artifactId>ccw-application</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
-    <name>Collection Tracking Application</name>
+    <name>CCW Application</name>
 
     <repositories>
         <!-- jhipster-needle-maven-repository -->
@@ -247,6 +247,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.vintage</groupId>
+                    <artifactId>junit-vintage-engine</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -307,30 +313,11 @@
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
         </dependency>
-        <!-- Cucumber -->
-        <dependency>
-            <groupId>io.cucumber</groupId>
-            <artifactId>cucumber-junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.cucumber</groupId>
-            <artifactId>cucumber-spring</artifactId>
-            <scope>test</scope>
-        </dependency>
         <!-- jhipster-needle-maven-add-dependency -->
     </dependencies>
 
     <build>
         <defaultGoal>spring-boot:run</defaultGoal>
-        <testResources>
-            <testResource>
-                <directory>src/test/resources/</directory>
-            </testResource>
-            <testResource>
-                <directory>src/test/features</directory>
-            </testResource>
-        </testResources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -600,7 +587,7 @@
                             <image>adoptopenjdk:11-jre-hotspot</image>
                         </from>
                         <to>
-                            <image>collectiontrackingapplication:latest</image>
+                            <image>ccwapplication:latest</image>
                         </to>
                         <container>
                             <entrypoint>
@@ -636,11 +623,11 @@
                         <changeLogFile>${project.basedir}/src/main/resources/config/liquibase/master.xml</changeLogFile>
                         <diffChangeLogFile>${project.basedir}/src/main/resources/config/liquibase/changelog/${maven.build.timestamp}_changelog.xml</diffChangeLogFile>
                         <driver>org.h2.Driver</driver>
-                        <url>jdbc:h2:file:${project.build.directory}/h2db/db/collectiontrackingapplication</url>
+                        <url>jdbc:h2:file:${project.build.directory}/h2db/db/ccwapplication</url>
                         <defaultSchemaName></defaultSchemaName>
-                        <username>CollectionTrackingApplication</username>
+                        <username>CCWApplication</username>
                         <password></password>
-                        <referenceUrl>hibernate:spring:com.finca.ccwapp.domain?dialect=org.hibernate.dialect.H2Dialect&amp;hibernate.physical_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy&amp;hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy</referenceUrl>
+                        <referenceUrl>hibernate:spring:com.finca.ccw.domain?dialect=org.hibernate.dialect.H2Dialect&amp;hibernate.physical_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy&amp;hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy</referenceUrl>
                         <verbose>true</verbose>
                         <logging>debug</logging>
                         <contexts>!test</contexts>

diff --git a/sonar-project.properties b/sonar-project.properties
@@ -1,5 +1,5 @@
-sonar.projectKey=CollectionTrackingApplication
-sonar.projectName=CollectionTrackingApplication generated by jhipster
+sonar.projectKey=CCWApplication
+sonar.projectName=CCWApplication generated by jhipster
 sonar.projectVersion=1.0
 
 sonar.sources=src/main/