Skip to content

Commit

Permalink
Merge pull request #6 from ERP-System-Contributors/master
Browse files Browse the repository at this point in the history
Move recent updates to home repository
  • Loading branch information
ghacupha authored Dec 18, 2024
2 parents 1a046a0 + 284f4a6 commit 1f88e61
Show file tree
Hide file tree
Showing 6,276 changed files with 154,993 additions and 8,559 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
# Erp System - Mark X No 10 (Jehoiada Series) Server ver 1.8.2
# Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors ([email protected])
#
# This program is free software: you can redistribute it and/or modify
Expand Down
30 changes: 2 additions & 28 deletions .github/workflows/github-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
- uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: '17.x'
java-version: '18.x'

- name: Install node.js packages
run: npm install
Expand All @@ -54,24 +54,6 @@ jobs:
chmod +x mvnw
npm run ci:backend:test
- name: Cache SonarCloud packages
uses: actions/cache@v3
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar
- name: Cache Maven packages
uses: actions/cache@v3
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: Build and analyze
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: mvn -B org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=ERP-System-Contributors_erp-system

- name: Login to Docker hub
uses: docker/login-action@v1
with:
Expand All @@ -82,12 +64,4 @@ jobs:
run: ./mvnw -ntp package jib:dockerBuild -Pprod -DskipTests

- name: Publish image
run: docker push ghacupha/erp-system:1.8.0

- name: Build and Publish Elasticsearch image
uses: docker/build-push-action@v2
with:
context: .
file: src/main/docker/ESDockerfile
push: true
tags: ghacupha/erp-system-elastic-search:1.8.0
run: docker push ghacupha/erp-system:1.8.2
6 changes: 6 additions & 0 deletions .jhipster/IFRS16LeaseContract.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@
"otherEntityName": "businessDocument",
"relationshipType": "many-to-one",
"otherEntityField": "documentTitle"
},
{
"relationshipName": "leasePayment",
"otherEntityName": "leasePayment",
"relationshipType": "one-to-many",
"otherEntityRelationshipName": "leaseContract"
}
],
"service": "serviceImpl",
Expand Down
94 changes: 94 additions & 0 deletions .jhipster/InternalMemo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
{
"fields": [
{
"fieldName": "catalogueNumber",
"fieldType": "String",
"fieldValidateRules": ["required", "unique", "minlength", "maxlength"],
"fieldValidateRulesMinlength": "8",
"fieldValidateRulesMaxlength": "8"
},
{
"fieldName": "referenceNumber",
"fieldType": "String",
"fieldValidateRules": ["required", "unique"]
},
{
"fieldName": "memoDate",
"fieldType": "LocalDate",
"fieldValidateRules": ["required"]
},
{
"fieldName": "purposeDescription",
"fieldType": "String"
}
],
"relationships": [
{
"relationshipName": "actionRequired",
"otherEntityName": "memoAction",
"relationshipType": "many-to-one",
"otherEntityField": "action"
},
{
"relationshipName": "addressedTo",
"otherEntityName": "dealer",
"relationshipType": "many-to-one",
"otherEntityField": "dealerName"
},
{
"relationshipName": "from",
"otherEntityName": "dealer",
"relationshipType": "many-to-one",
"otherEntityField": "dealerName"
},
{
"relationshipName": "preparedBy",
"otherEntityName": "dealer",
"relationshipType": "many-to-many",
"otherEntityField": "dealerName",
"ownerSide": true,
"otherEntityRelationshipName": "internalMemo"
},
{
"relationshipName": "reviewedBy",
"otherEntityName": "dealer",
"relationshipType": "many-to-many",
"otherEntityField": "dealerName",
"ownerSide": true,
"otherEntityRelationshipName": "internalMemo"
},
{
"relationshipName": "approvedBy",
"otherEntityName": "dealer",
"relationshipType": "many-to-many",
"otherEntityField": "dealerName",
"ownerSide": true,
"otherEntityRelationshipName": "internalMemo"
},
{
"relationshipName": "memoDocument",
"otherEntityName": "businessDocument",
"relationshipType": "many-to-many",
"relationshipValidateRules": ["required"],
"otherEntityField": "documentTitle",
"ownerSide": true,
"otherEntityRelationshipName": "internalMemo"
},
{
"relationshipName": "placeholder",
"otherEntityName": "placeholder",
"relationshipType": "many-to-many",
"otherEntityField": "description",
"ownerSide": true,
"otherEntityRelationshipName": "internalMemo"
}
],
"service": "serviceImpl",
"dto": "mapstruct",
"jpaMetamodelFiltering": true,
"readOnly": false,
"pagination": "pagination",
"name": "InternalMemo",
"changelogDate": "20240530092852",
"incrementalChangelog": false
}
49 changes: 49 additions & 0 deletions .jhipster/LeaseAmortizationCalculation.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"fields": [
{
"fieldName": "periodicity",
"fieldType": "String"
},
{
"fieldName": "leaseAmount",
"fieldType": "BigDecimal"
},
{
"fieldName": "numberOfPeriods",
"fieldType": "Integer"
},
{
"fieldName": "interestRate",
"fieldType": "BigDecimal",
"fieldValidateRules": ["required", "min"],
"fieldValidateRulesMin": 0
}
],
"relationships": [
{
"relationshipName": "leaseLiability",
"otherEntityName": "leaseLiability",
"relationshipType": "one-to-one",
"ownerSide": false,
"otherEntityRelationshipName": "leaseAmortizationCalculation"
},
{
"relationshipName": "leaseContract",
"otherEntityName": "iFRS16LeaseContract",
"relationshipType": "one-to-one",
"relationshipValidateRules": ["required"],
"otherEntityField": "bookingId",
"ownerSide": true,
"id": false,
"otherEntityRelationshipName": "leaseAmortizationCalculation"
}
],
"service": "serviceImpl",
"dto": "mapstruct",
"jpaMetamodelFiltering": true,
"readOnly": false,
"pagination": "pagination",
"name": "LeaseAmortizationCalculation",
"changelogDate": "20240614144622",
"incrementalChangelog": false
}
42 changes: 42 additions & 0 deletions .jhipster/LeaseAmortizationSchedule.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"fields": [
{
"fieldName": "identifier",
"fieldType": "UUID",
"fieldValidateRules": ["required", "unique"]
}
],
"relationships": [
{
"relationshipName": "leaseLiability",
"otherEntityName": "leaseLiability",
"relationshipType": "many-to-one",
"relationshipValidateRules": ["required"],
"otherEntityField": "leaseId"
},
{
"relationshipName": "leaseLiabilityScheduleItem",
"otherEntityName": "leaseLiabilityScheduleItem",
"relationshipType": "one-to-many",
"otherEntityRelationshipName": "leaseAmortizationSchedule"
},
{
"relationshipName": "leaseContract",
"otherEntityName": "iFRS16LeaseContract",
"relationshipType": "one-to-one",
"relationshipValidateRules": ["required"],
"otherEntityField": "bookingId",
"ownerSide": true,
"id": false,
"otherEntityRelationshipName": "leaseAmortizationSchedule"
}
],
"service": "serviceImpl",
"dto": "mapstruct",
"jpaMetamodelFiltering": true,
"readOnly": false,
"pagination": "pagination",
"name": "LeaseAmortizationSchedule",
"changelogDate": "20240618060855",
"incrementalChangelog": false
}
60 changes: 60 additions & 0 deletions .jhipster/LeaseLiability.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
{
"fields": [
{
"fieldName": "leaseId",
"fieldType": "String",
"fieldValidateRules": ["required", "unique"]
},
{
"fieldName": "liabilityAmount",
"fieldType": "BigDecimal",
"fieldValidateRules": ["required", "min"],
"fieldValidateRulesMin": 0
},
{
"fieldName": "startDate",
"fieldType": "LocalDate",
"fieldValidateRules": ["required"]
},
{
"fieldName": "endDate",
"fieldType": "LocalDate",
"fieldValidateRules": ["required"]
},
{
"fieldName": "interestRate",
"fieldType": "BigDecimal",
"fieldValidateRules": ["required", "min"],
"fieldValidateRulesMin": 0
}
],
"relationships": [
{
"relationshipName": "leaseAmortizationCalculation",
"otherEntityName": "leaseAmortizationCalculation",
"relationshipType": "one-to-one",
"otherEntityField": "id",
"ownerSide": true,
"id": false,
"otherEntityRelationshipName": "leaseLiability"
},
{
"relationshipName": "leaseContract",
"otherEntityName": "iFRS16LeaseContract",
"relationshipType": "one-to-one",
"relationshipValidateRules": ["required"],
"otherEntityField": "bookingId",
"ownerSide": true,
"id": false,
"otherEntityRelationshipName": "leaseLiability"
}
],
"service": "serviceImpl",
"dto": "mapstruct",
"jpaMetamodelFiltering": true,
"readOnly": false,
"pagination": "pagination",
"name": "LeaseLiability",
"changelogDate": "20240618060237",
"incrementalChangelog": false
}
58 changes: 58 additions & 0 deletions .jhipster/LeaseLiabilityByAccountReport.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"fields": [
{
"fieldName": "reportId",
"fieldType": "UUID",
"fieldValidateRules": ["required", "unique"]
},
{
"fieldName": "timeOfRequest",
"fieldType": "ZonedDateTime"
},
{
"fieldName": "fileChecksum",
"fieldType": "String"
},
{
"fieldName": "tampered",
"fieldType": "Boolean"
},
{
"fieldName": "filename",
"fieldType": "UUID"
},
{
"fieldName": "reportParameters",
"fieldType": "String"
},
{
"fieldName": "reportFile",
"fieldType": "byte[]",
"fieldTypeBlobContent": "any"
}
],
"relationships": [
{
"relationshipName": "requestedBy",
"otherEntityName": "applicationUser",
"relationshipType": "many-to-one",
"otherEntityField": "applicationIdentity"
},
{
"relationshipName": "leasePeriod",
"otherEntityName": "leasePeriod",
"relationshipType": "many-to-one",
"relationshipValidateRules": ["required"],
"otherEntityField": "periodCode"
}
],
"service": "serviceImpl",
"dto": "mapstruct",
"jpaMetamodelFiltering": true,
"readOnly": false,
"pagination": "pagination",
"entityTableName": "lease_liability_by_acct_rpt",
"name": "LeaseLiabilityByAccountReport",
"changelogDate": "20240828112149",
"incrementalChangelog": false
}
Loading

0 comments on commit 1f88e61

Please sign in to comment.