Skip to content

Commit 7bb4a5f

Browse files
committed
Fixed urban rivers scripts. #3033
1 parent 551b410 commit 7bb4a5f

File tree

3 files changed

+6
-30
lines changed

3 files changed

+6
-30
lines changed

src/main/scripts/releases/3.1/adhoc/createUrbanRivers12monthSubProgram.js

+2-10
Original file line numberDiff line numberDiff line change
@@ -735,19 +735,11 @@ var priorities = [
735735

736736
//Create the parent program
737737
let programName = "Urban Rivers and Catchments Program";
738-
var parentProgram = createOrFindProgram(programName);
738+
var parent = createOrFindProgram(programName);
739739
var subprograms = ["URCP round 1 election commitments - 12 month reports"]
740740

741-
var parent = db.program.find({name: parentProgram}).next();
742741
subprograms.forEach(function (subProgram){
743-
var now = ISODate();
744-
var p = {name: subProgram, programId: UUID.generate(), dateCreated: now, lastUpdate: now, parent: parent._id, status: "active"}
745-
var program = db.program.find({name: subProgram})
746-
if (!program.hasNext()) {
747-
db.program.insertOne(p);
748-
} else {
749-
print("Program Already Exist: " + subProgram)
750-
}
742+
createOrFindProgram(subProgram, parent._id);
751743
});
752744

753745
subprograms.forEach(function (subprogram){

src/main/scripts/releases/3.1/adhoc/createUrbanRivers6monthSubProgram.js

+2-10
Original file line numberDiff line numberDiff line change
@@ -739,19 +739,11 @@ var priorities = [
739739

740740
//Create the parent program
741741
let programName = "Urban Rivers and Catchments Program";
742-
var parentProgram = createOrFindProgram(programName);
742+
var parent = createOrFindProgram(programName);
743743
var subprograms = ["URCP round 1 election commitments - 6 month reports"]
744744

745-
var parent = db.program.find({name: parentProgram}).next();
746745
subprograms.forEach(function (subProgram){
747-
var now = ISODate();
748-
var p = {name: subProgram, programId: UUID.generate(), dateCreated: now, lastUpdate: now, parent: parent._id, status: "active"}
749-
var program = db.program.find({name: subProgram})
750-
if (!program.hasNext()) {
751-
db.program.insertOne(p);
752-
} else {
753-
print("Program Already Exist: " + subProgram)
754-
}
746+
createOrFindProgram(subProgram, parent._id);
755747
});
756748

757749
subprograms.forEach(function (subprogram){

src/main/scripts/releases/3.1/adhoc/createUrbanRiversFinalReportSubProgram.js

+2-10
Original file line numberDiff line numberDiff line change
@@ -737,19 +737,11 @@ var priorities = [
737737

738738
//Create the parent program
739739
let programName = "Urban Rivers and Catchments Program";
740-
var parentProgram = createOrFindProgram(programName);
740+
var parent = createOrFindProgram(programName);
741741
var subprograms = ["Urban Rivers and Catchments round one - Final report"]
742742

743-
var parent = db.program.find({name: parentProgram}).next();
744743
subprograms.forEach(function (subProgram){
745-
var now = ISODate();
746-
var p = {name: subProgram, programId: UUID.generate(), dateCreated: now, lastUpdate: now, parent: parent._id, status: "active"}
747-
var program = db.program.find({name: subProgram})
748-
if (!program.hasNext()) {
749-
db.program.insertOne(p);
750-
} else {
751-
print("Program Already Exist: " + subProgram)
752-
}
744+
createOrFindProgram(subProgram, parent._id);
753745
});
754746

755747
subprograms.forEach(function (subprogram){

0 commit comments

Comments
 (0)