Merge pull request #606 from CSCfi/better-review-comments

feat: show better review comment labels
CSCfi · Jul 12, 2018 · acacad7 · acacad7
2 parents 413a388 + ffceb7d
commit acacad7
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/resources/translations/en-GB.edn b/resources/translations/en-GB.edn
@@ -160,8 +160,9 @@
           :status-changed-subject "Application state change"}
   :footer "Powered by CSC - IT Center for Science"
   :form {:actions "Actions"
-         :add-comments "Add comment to the decision (shown to applicant except if review)"
-         :add-comments-not-shown-to-applicant "Add comment to the decision"
+         :add-comments "Add comment to the decision"
+         :add-comments-shown-to-applicant "Add comment to the decision (shown to applicant except if review)"
+         :add-comments-not-shown-to-applicant "Add comment to the decision (not shown to applicant)"
          :alert-disabled-items "The following resources can't be applied anymore. Consider closing this draft and creating a new application."
          :application "Application"
          :back "Back to catalogue"

diff --git a/resources/translations/fi.edn b/resources/translations/fi.edn
@@ -161,8 +161,9 @@
           :status-changed-subject "Hakemuksen tila on muuttunut"}
   :footer "CSC - IT Center for Science"
   :form {:actions "Toiminnot"
-         :add-comments "Lisää päätökseen kommentti (näkyy hakijalle paitsi jos katselmointi)"
-         :add-comments-not-shown-to-applicant "Lisää päätökseen kommentti"
+         :add-comments "Lisää päätökseen kommentti"
+         :add-comments-shown-to-applicant "Lisää päätökseen kommentti (näkyy hakijalle paitsi jos katselmointi)"
+         :add-comments-not-shown-to-applicant "Lisää päätökseen kommentti (ei näy hakijalle)"
          :alert-disabled-items "Seuraavia resursseja ei voi enää hakea. Harkitse tämän luonnoksen sulkemista ja tee sitten uusi hakemus."
          :application "Tiedot"
          :back "Takaisin kielivaroihin"

diff --git a/src/clj/rems/api/schema.clj b/src/clj/rems/api/schema.clj
@@ -71,6 +71,8 @@
    (s/optional-key :can-approve?) s/Bool
    (s/optional-key :can-close?) s/Bool
    (s/optional-key :can-withdraw?) s/Bool
+   (s/optional-key :can-third-party-review?) s/Bool
+   (s/optional-key :is-applicant?) s/Bool
    (s/optional-key :review) (s/enum :third-party)
    :catalogue-items [CatalogueItem]
    (s/optional-key :review-type) (s/maybe (s/enum :normal :third-party))

diff --git a/src/clj/rems/db/applications.clj b/src/clj/rems/db/applications.clj
@@ -340,7 +340,9 @@
                    :review-type :normal
                    :can-approve? false
                    :can-close? true
-                   :can-withdrwa? false}
+                   :can-withdraw? false
+                   :can-third-party-review? false
+                   :is-applicant? true}
      :applicant-attributes {\"eppn\" \"developer\"
                             \"email\" \"developer@e.mail\"
                             \"displayName\" \"deve\"
@@ -390,6 +392,8 @@
                           :can-approve? (can-approve? application)
                           :can-close? (can-close? application)
                           :can-withdraw? (can-withdraw? application)
+                          :can-third-party-review? (can-third-party-review? application)
+                          :is-applicant? (is-applicant? application)
                           :review-type review-type)
       :applicant-attributes (users/get-user-attributes (:applicantuserid application))
       :items items

diff --git a/src/cljs/rems/application.cljs b/src/cljs/rems/application.cljs
@@ -623,7 +623,10 @@
         :title (text :t.form/actions)
         :always [:div
                  [:div.form-group
-                  [:label {:for "judge-comment"} (text :t.form/add-comments)]
+                  [:label {:for "judge-comment"}
+                   (cond (:is-applicant? app) (text :t.form/add-comments)
+                         (:can-third-party-review? app) (text :t.form/add-comments-not-shown-to-applicant)
+                         :else (text :t.form/add-comments-shown-to-applicant))]
                   [:textarea#judge-comment.form-control
                    {:name "judge-comment" :placeholder "Comment"
                     :value @(rf/subscribe [::judge-comment])