2024-10-30 - feedback - external reviewer - server-side

Author: Luch76

server/src/main/java/com/objectcomputing/checkins/services/feedback_template/FeedbackTemplateController.java

@@ -116,7 +116,7 @@ public List<FeedbackTemplateResponseDTO> findByValues(@Nullable UUID creatorId,
      * @return {@link FeedbackTemplate}
      */
     private FeedbackTemplate fromDTO(FeedbackTemplateCreateDTO dto) {
-        return new FeedbackTemplate(dto.getTitle(), dto.getDescription(), dto.getCreatorId(), dto.getIsPublic(), dto.getIsAdHoc(), dto.getIsReview());
+        return new FeedbackTemplate(dto.getTitle(), dto.getDescription(), dto.getCreatorId(), dto.getIsPublic(), dto.getIsAdHoc(), dto.getIsReview(), dto.getIsForExternalRecipient());
     }
 
     /**

server/src/main/resources/db/dev/R__Load_testing_data.sql

@@ -1250,7 +1250,7 @@ VALUES
 INSERT INTO feedback_templates
 (id, title, description, creator_id, date_created, active, is_public, is_ad_hoc, is_for_external_recipient) -- created by: Big Boss
 VALUES
-    ('265c4d57-7cd9-4c14-9878-bd05d3bb59f1', 'Survey 1', 'Make a survey with a few questions for external recipients'
+    ('265c4d57-7cd9-4c14-9878-bd05d3bb59f1', 'Survey For External Recips', 'Make a survey with a few questions for external recipients'
     , '72655c4f-1fb8-4514-b31e-7f7e19fa9bd7', '2021-05-05', true, true, false, true)
 ;
 INSERT INTO template_questions

web-ui/src/components/feedback_template_selector/FeedbackTemplateSelector.jsx

@@ -98,6 +98,7 @@ const FeedbackTemplateSelector = ({ query, changeQuery }) => {
         isAdHoc: true,
         isPublic: false,
         isReview: false,
+        isForExternalRecipient: submittedTemplate.isForExternalRecipient,
       };
 
       const newTemplateQuestion = {
@@ -189,6 +190,7 @@ const FeedbackTemplateSelector = ({ query, changeQuery }) => {
         isAdHoc={template.isAdHoc}
         isPublic={template.isPublic}
         isReview={template.isReview}
+        isForExternalRecipient={template.isForExternalRecipient}
         isSelected={query === template.id}
         questions={template.questions}
         expanded={preview.open}

web-ui/src/components/template-card/TemplateCard.css

@@ -1,7 +1,7 @@
 .feedback-template-card {
   cursor: pointer;
   width: 300px;
-  max-height: 300px;
+  max-height: 350px;
   padding: 15px;
   margin: 20px;
   box-shadow: #282c34;
@@ -24,7 +24,7 @@
   text-align: center;
   padding-bottom: 0;
   margin-bottom: 0;
-  max-height: 200px;
+  max-height: 250px;
 }
 
 .feedback-template-card .template-name {
@@ -44,6 +44,11 @@
   margin: 0;
 }
 
+.feedback-template-card .externalRecipient {
+  text-align: left;
+  margin: 0;
+}
+
 @media (min-width: 321px) and (max-width: 820px) {
   .feedback-template-card {
     width: 100%;

web-ui/src/components/template-card/TemplateCard.jsx

@@ -111,6 +111,17 @@ const TemplateCard = props => {
         <p className="creator">
           Created by: <b>{creatorName}</b>
         </p>
+        {props.isForExternalRecipient && (
+            <label className="externalRecipientLabel" style={{ display: 'flex', alignItems: 'center' }}>
+              <input
+                  type="checkbox"
+                  checked={props.isForExternalRecipient}
+                  disabled
+                  className="externalRecipient"
+              />
+              <span style={{ marginLeft: '5px' }}>For external recipients only</span>
+            </label>
+        )}
       </CardContent>
     </Card>
   );

web-ui/src/components/template-preview-modal/TemplatePreviewModal.jsx

@@ -114,6 +114,7 @@ const TemplatePreviewModal = ({
       submittedTemplate.title = newAdHocData.title;
       submittedTemplate.description = newAdHocData.description;
       submittedQuestion = newAdHocData.question;
+      submittedTemplate.isForExternalRecipient = newAdHocData.isForExternalRecipient;
     }
     onSubmit(submittedTemplate, submittedQuestion);
   };

web-ui/src/components/template-preview-modal/ad_hoc_creation_form/AdHocCreationForm.jsx

@@ -8,53 +8,65 @@ const propTypes = {
 const AdHocCreationForm = props => {
   const [title, setTitle] = useState('Ad Hoc');
   const [description, setDescription] = useState('');
+  const [isForExternalRecipient, setIsForExternalRecipient] = useState(false);
   const [question, setQuestion] = useState('');
 
   useEffect(() => {
     props.onFormChange({
-      title: title,
-      description: description,
-      question: question
+      title: title
+        , description: description
+        , question: question
+        , isForExternalRecipient: isForExternalRecipient
     }); // eslint-disable-next-line
-  }, [title, description, question]);
+  }, [title, description, question, isForExternalRecipient]);
 
   return (
-    <React.Fragment>
-      <TextField
-        label="Title"
-        placeholder="Ad Hoc"
-        fullWidth
-        margin="normal"
-        required={true}
-        value={title}
-        onChange={event => {
-          setTitle(event.target.value);
-        }}
-      />
-      <TextField
-        label="Description"
-        placeholder="Give a brief description of the template (optional)"
-        fullWidth
-        margin="normal"
-        value={description}
-        onChange={event => {
-          setDescription(event.target.value);
-        }}
-      />
-      <TextField
-        label="Ask a feedback question"
-        placeholder="How is your day going?"
-        fullWidth
-        multiline
-        maxRows={10}
-        margin="normal"
-        required={true}
-        value={question}
-        onChange={event => {
-          setQuestion(event.target.value);
-        }}
-      />
-    </React.Fragment>
+      <React.Fragment>
+          <TextField
+              label="Title"
+              placeholder="Ad Hoc"
+              fullWidth
+              margin="normal"
+              required={true}
+              value={title}
+              onChange={event => {
+                  setTitle(event.target.value);
+              }}
+          />
+          <TextField
+              label="Description"
+              placeholder="Give a brief description of the template (optional)"
+              fullWidth
+              margin="normal"
+              value={description}
+              onChange={event => {
+                  setDescription(event.target.value);
+              }}
+          />
+          <label style={{display: 'flex', alignItems: 'center'}}>
+              <input
+                  type="checkbox"
+                  checked={isForExternalRecipient}
+                  onChange={event => {
+                      setIsForExternalRecipient(event.target.checked);
+                  }}
+              />
+              <span style={{marginLeft: '5px'}}>For external recipients only</span>
+          </label>
+          <TextField
+              label="Ask a feedback question"
+              placeholder="How is your day going?"
+              fullWidth
+              multiline
+              maxRows={10}
+              margin="normal"
+              required={true}
+              value={question}
+              onChange={event => {
+                  setQuestion(event.target.value);
+              }}
+          />
+      </React.Fragment>
   );
 };