-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/dev' into feature/issue3169
- Loading branch information
Showing
18 changed files
with
6,674 additions
and
157 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <g:if test="${dashboardData}"> | ||
| <div class="dashboard-section" style="padding:10px; margin-top:10px;"> | ||
| <g:each in="${dashboardData.groupBy{it.category}}" var="category"> | ||
| <h3 class="serviceTitle">${category.key}</h3> | ||
| <g:each in="${category.value}" var="score"> | ||
| <fc:renderScore score="${score}" includeInvoiced="false"></fc:renderScore> | ||
| </g:each> | ||
| </g:each> | ||
| </div> | ||
| </g:if> | ||
|
|
||
| <g:render template="/shared/dashboard"></g:render> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
src/main/scripts/releases/4.2/adhoc/addIsDefaultToGeoGraphicInfo.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| load('../../../utils/audit.js'); | ||
| var userId = "system"; | ||
| db.project.find({"geographicInfo": {$exists: true}, | ||
| "geographicInfo.isDefault": {$exists: false}} | ||
| ).forEach(function(project) { | ||
| if (project.geographicInfo && project.geographicInfo.isDefault === undefined) { | ||
| project.geographicInfo.isDefault = false; | ||
| db.project.save(project); | ||
| audit(project, project.projectId, 'au.org.ala.ecodata.Project', userId, undefined, "Update"); | ||
| print("Updated project: " + project.projectId); | ||
| } | ||
| }); |
84 changes: 84 additions & 0 deletions
84
src/main/scripts/releases/4.2/adhoc/createNewResearchAndDevelopmentScore.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| load('../../../utils/uuid.js'); | ||
| load('../../../utils/audit.js'); | ||
| let adminUserId = '<tbd>' | ||
| const invoiceScoreId = '7u24188f-852h-3bex-c49g-60a2dsaa8723'; | ||
| let scores = [ | ||
|
|
||
| { | ||
| scoreId: invoiceScoreId, | ||
| entityTypes: undefined, | ||
| tags: [], | ||
| displayType: '', | ||
| entity: 'Activity', | ||
| outputType: 'Research and Development', | ||
| isOutputTarget: false, | ||
| category: 'Reporting', | ||
| status: 'active', | ||
| label: 'Invoiced number of hours conducting research and development', | ||
| description: '', | ||
| configuration: { | ||
| childAggregations: [ | ||
| { | ||
| filter: { | ||
| property: 'name', | ||
| filterValue: 'NHT - Research and development', | ||
| type: 'filter' | ||
| }, | ||
| childAggregations: [ | ||
| { | ||
| property: 'data.noHoursConductingResearchAndDevelopmentInvoiced', | ||
| type: 'SUM' | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| , | ||
| { | ||
| _id: ObjectId('664c25abb61a6108c799bb66'), | ||
| scoreId: UUID.generate(), | ||
| label: 'Number of hours conducting research and development', | ||
| status: 'active', | ||
| isOutputTarget: true, | ||
| category: 'RLP and Bushfire Recovery', | ||
| outputType: 'Research and Development', | ||
| configuration: { | ||
| childAggregations: [ | ||
| { | ||
| filter: { | ||
| property: 'name', | ||
| filterValue: 'NHT - Research and development', | ||
| type: 'filter' | ||
| }, | ||
| childAggregations: [ | ||
| { | ||
| property: 'data.noHoursConductingResearchAndDevelopment', | ||
| type: 'SUM' | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| dateCreated: ISODate('2024-12-17T04:40:11.160Z'), | ||
| lastUpdated: ISODate('2024-12-17T04:40:11.160Z'), | ||
| relatedScores: [ | ||
| { | ||
| description: 'Invoiced by', | ||
| scoreId: invoiceScoreId | ||
| } | ||
| ] | ||
| }]; | ||
|
|
||
|
|
||
| for (let i=0; i<scores.length; i+=2) { | ||
| let invoiced = scores[i]; | ||
| let delivered = scores[i+1]; | ||
|
|
||
| audit(invoiced, invoiced.scoreId, 'au.org.ala.ecodata.Score', adminUserId, null, 'Insert'); | ||
| db.score.insertOne(invoiced); | ||
|
|
||
| audit(delivered, delivered.scoreId, 'au.org.ala.ecodata.Score', adminUserId, null, 'Insert'); | ||
| db.score.insertOne(delivered); | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters