Merge branch 'candidate' of https://github.com/NCI-Agency/anet into G…

…H-11
NCI-Agency · Nov 3, 2017 · bf8409e · bf8409e
2 parents e708d34 + fd8e7ba
commit bf8409e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -57,7 +57,7 @@ addons:
     notification_email: vassil.iordanov@gmail.com
     build_command_prepend: "./gradlew clean"
     build_command:   "./gradlew build -x test"
-    branch_pattern: candidate
+    branch_pattern: candidate_scan
   sonarcloud:
     organization: "nci-agency-github"
     token:

diff --git a/docs/INSTALL.md b/docs/INSTALL.md
@@ -172,6 +172,14 @@ dictionary:
   POAM_LONG_NAME: Plan of Action and Milestones / Pillars
   POAM_SHORT_NAME: PoAM
   NAV_BAR_ALL_ADVISOR_ORGS: All EFs / AOs
+  PRINCIPAL_ORG_LABEL_LONGNAME: Official Organization Name
+  PRINCIPAL_ORG_PLACEHOLDER_LONGNAME: e.g. Afghan Ministry of Defense
+  ADVISOR_ORG_LABEL_LONGNAME: Description
+  ADVISOR_ORG_PLACEHOLDER_LONGNAME: e.g. Force Sustainment
+  PRINCIPAL_ORG_LABEL_IDENTIFICATIONCODE: Identification Code
+  PRINCIPAL_ORG_PLACEHOLDER_IDENTIFICATIONCODE: optional
+  ADVISOR_ORG_LABEL_IDENTIFICATIONCODE: UIC
+  ADVISOR_ORG_PLACEHOLDER_IDENTIFICATIONCODE: the six character code
   pinned_ORGs:
     - Key Leader Engagement
   non_reporting_ORGs:
@@ -217,6 +225,8 @@ dictionary:
     - Ukraine
     - United Kingdom
     - United States of America
+  principal_countries:
+    - Afghanistan
   ranks:
     - CIV
     - CTR
@@ -245,7 +255,7 @@ dictionary:
     - OF-9
     - OF-10
 ```
-As can be seen from the example above, the entries `pinned_ORGs`, `non_reporting_ORGs`, `countries` and `ranks` are lists of values; the others are simple key/value pairs. The values in the `pinned_ORGs` and `non_reporting_ORGs` lists should match the shortName field of organizations in the database. The key/value pairs are mostly used as deployment-specific labels for fields in the user interface.
+As can be seen from the example above, the entries `pinned_ORGs`, `non_reporting_ORGs`, `countries`, `principa_countries` and `ranks` are lists of values; the others are simple key/value pairs. The values in the `pinned_ORGs` and `non_reporting_ORGs` lists should match the shortName field of organizations in the database. The key/value pairs are mostly used as deployment-specific labels for fields in the user interface.
 
 # How to enable SSL
 Below is a subset from the complete Dropwizard Documentation that can be found here: http://www.dropwizard.io/1.0.5/docs/manual/core.html#ssl

diff --git a/docs/anet.yml.production.template b/docs/anet.yml.production.template
@@ -146,6 +146,14 @@ dictionary:
   POAM_LONG_NAME: Plan of Action and Milestones / Pillars
   POAM_SHORT_NAME: PoAM
   NAV_BAR_ALL_ADVISOR_ORGS: All EFs / AOs
+  PRINCIPAL_ORG_LABEL_LONGNAME: Official Organization Name
+  PRINCIPAL_ORG_PLACEHOLDER_LONGNAME: e.g. Afghan Ministry of Defense
+  ADVISOR_ORG_LABEL_LONGNAME: Description
+  ADVISOR_ORG_PLACEHOLDER_LONGNAME: e.g. Force Sustainment
+  PRINCIPAL_ORG_LABEL_IDENTIFICATIONCODE: Identification Code
+  PRINCIPAL_ORG_PLACEHOLDER_IDENTIFICATIONCODE: optional
+  ADVISOR_ORG_LABEL_IDENTIFICATIONCODE: UIC
+  ADVISOR_ORG_PLACEHOLDER_IDENTIFICATIONCODE: the six character code
   pinned_ORGs:
     - Key Leader Engagement
   non_reporting_ORGs:
@@ -191,6 +199,8 @@ dictionary:
     - Ukraine
     - United Kingdom
     - United States of America
+  principal_countries:
+    - Afghanistan
   ranks:
     - CIV
     - CTR