Remove ratings legacy feature #225

atlp-rwanda · Oct 24, 2024 · b909a34 · b909a34
1 parent 464657e
commit b909a34
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 215 deletions.
diff --git a/src/Mutations/Ratings.tsx b/src/Mutations/Ratings.tsx
@@ -9,12 +9,6 @@ export const ADD_RATING = gql`
     $cohort: String!
     $professionalSkills: String!
     $orgToken: String!
-    $quantityRemark: String
-    $bodyQuality: String
-    $qualityRemark: String
-    $bodyQuantity: String
-    $professionalRemark: String
-    $bodyProfessional: String
   ) {
     addRatings(
       user: $user
@@ -24,12 +18,6 @@ export const ADD_RATING = gql`
       cohort: $cohort
       professional_Skills: $professionalSkills
       orgToken: $orgToken
-      quantityRemark: $quantityRemark
-      bodyQuality: $bodyQuality
-      qualityRemark: $qualityRemark
-      bodyQuantity: $bodyQuantity
-      professionalRemark: $professionalRemark
-      bodyProfessional: $bodyProfessional
     ) {
       user {
         id
@@ -45,7 +33,6 @@ export const ADD_RATING = gql`
         }
       }
       quantity
-      quantityRemark
       feedbacks {
         sender {
           email
@@ -59,13 +46,8 @@ export const ADD_RATING = gql`
         content
         createdAt
       }
-      bodyQuantity
       quality
-      qualityRemark
-      bodyQuality
       professional_Skills
-      professionalRemark
-      bodyProfessional
       approved
       coordinator
     }
@@ -77,34 +59,25 @@ export const UPDATE_RATING = gql`
     $user: String!
     $sprint: Int!
     $quantity: [String]
-    $quantityRemark: [String]
     $quality: [String]
-    $qualityRemark: [String]
     $professionalSkills: [String]
-    $professionalRemark: [String]
     $feedbacks: [String]
     $orgToken: String!
   ) {
     updateRating(
       user: $user
       sprint: $sprint
       quantity: $quantity
-      quantityRemark: $quantityRemark
       quality: $quality
-      qualityRemark: $qualityRemark
       professional_Skills: $professionalSkills
-      professionalRemark: $professionalRemark
       feedbacks: $feedbacks
       orgToken: $orgToken
     ) {
       user
       sprint
       quantity
-      quantityRemark
       quality
-      qualityRemark
       professional_Skills
-      professionalRemark
       feedbacks {
         content
       }
@@ -164,9 +137,6 @@ export const APPROVE_RATING = gql`
       user
       sprint
       quantity
-      quantityRemark
-      qualityRemark
-      professionalRemark
       professional_Skills
       approved
       quality

diff --git a/src/Mutations/replyMutation.tsx b/src/Mutations/replyMutation.tsx
@@ -3,25 +3,13 @@ import { gql } from '@apollo/client';
 export const ADD_REPLY = gql`
   mutation AddReply(
     $sprint: Int!
-    $bodyQuantity: String
-    $bodyQuality: String
-    $bodyProfessional: String
   ) {
     addReply(
       sprint: $sprint
-      bodyQuantity: $bodyQuantity
-      bodyQuality: $bodyQuality
-      bodyProfessional: $bodyProfessional
     ) {
       id
       user
       sprint
-      quantityRemark
-      qualityRemark
-      professionalRemark
-      bodyQuantity
-      bodyQuality
-      bodyProfessional
       createdAt
     }
   }
@@ -32,41 +20,23 @@ export const UPDATE_TO_REPLY = gql`
     $user: String!
     $sprint: Int!
     $orgToken: String!
-    $bodyQuality: [String]
-    $bodyQuantity: [String]
-    $bodyProfessional: [String]
     $quantity: [String]
-    $quantityRemark: [String]
     $quality: [String]
-    $qualityRemark: [String]
     $professionalSkills: [String]
-    $professionalRemark: [String]
   ) {
     updateToReply(
       user: $user
       sprint: $sprint
       orgToken: $orgToken
-      bodyQuality: $bodyQuality
-      bodyQuantity: $bodyQuantity
-      bodyProfessional: $bodyProfessional
       quantity: $quantity
-      quantityRemark: $quantityRemark
       quality: $quality
-      qualityRemark: $qualityRemark
       professional_Skills: $professionalSkills
-      professionalRemark: $professionalRemark
     ) {
       user
       sprint
-      bodyProfessional
-      bodyQuality
-      bodyQuantity
       quantity
-      quantityRemark
       quality
-      qualityRemark
       professional_Skills
-      professionalRemark
       approved
     }
   }

diff --git a/src/components/TraineePerformance.tsx b/src/components/TraineePerformance.tsx
@@ -15,16 +15,10 @@ export const GET_RATINGS_DATA = gql`
   query FetchRatingsTrainee {
     fetchRatingsTrainee {
       quality
-      qualityRemark
-      bodyQuality
       professional_Skills
-      bodyQuantity
-      quantityRemark
       quantity
       average
       sprint
-      professionalRemark
-      bodyProfessional
       approved
       cohort {
         name
@@ -62,9 +56,6 @@ function TraineePerfomance() {
     sprint: 0,
     username: 'string',
     user: 'string',
-    qualityremark: '',
-    quantityremark: '',
-    professionalRemark: '',
   });
 
   useEffect(() => {
@@ -75,11 +66,8 @@ function TraineePerfomance() {
         Name: item?.user?.profile?.name,
         Email: item?.user?.email,
         Quality: item.quality,
-        QualityRemark: item.qualityRemark,
         Quantity: item.quantity,
-        QuantityRemark: item.quantityRemark,
         Professional_Skills: item.professional_Skills,
-        Professional_SkillsRemark: item.professionalRemark,
         Average: item.average,
         Sprint: item.sprint,
         Cohort: item?.cohort?.name,
@@ -126,9 +114,6 @@ function TraineePerfomance() {
     setRow((prev) => ({
       ...prev,
       sprint: rate?.sprint,
-      quantityremark: rate?.quantityRemark,
-      qualityremark: rate?.qualityRemark,
-      professionalRemark: rate?.professionalRemark,
       id: user?.userId,
       username: rate?.cohort?.ttl?.profile?.name,
       user: rate?.cohort?.ttl?.email,

diff --git a/src/components/TraineePerformanceDetails.tsx b/src/components/TraineePerformanceDetails.tsx
@@ -10,9 +10,6 @@ function TraineePerfomanceDetails() {
   const organizationToken = localStorage.getItem('orgToken');
   const [rows, setRows] = useState({
     user: '',
-    bodyQuantity: '',
-    bodyQuality: '',
-    bodyProfessional: '',
     id: '',
   });
 
@@ -40,9 +37,6 @@ function TraineePerfomanceDetails() {
     variables: {
       user: ratings.user_id,
       sprint: ratings.user_sprint,
-      bodyQuantity: rows?.bodyQuantity,
-      bodyQuality: rows?.bodyQuality,
-      bodyProfessional: rows?.bodyProfessional,
       orgToken: organizationToken,
     },
     onError: () => {
@@ -120,7 +114,7 @@ function TraineePerfomanceDetails() {
               <td className="py-10 px-10 text-left">{t('Quality')}</td>
               <td className="py-3 ">{ratings.quality}</td>
               <td className="py-3  text-start text-sm">
-                {ratings?.quality_remark}
+                {ratings?.general_remark}
               </td>
               <td className="py-3 ">
                 <Button
@@ -229,11 +223,9 @@ function TraineePerfomanceDetails() {
                         <div className="m-4">
                           <div className=" ">
                             <input
-                              value={rows.bodyQuantity}
                               onChange={(e) =>
                                 setRows({
                                   ...rows,
-                                  bodyQuantity: e.target.value,
                                 })
                               }
                               className="w-full bg-inherit px-2 outline-0"
@@ -312,7 +304,7 @@ function TraineePerfomanceDetails() {
                       <div className="w-2/3 flex flex-col border border-gray-200 mb-4 float-left rounded-tr-lg rounded-bl-lg">
                         <div className="m-8">
                           <p className="float-left">
-                            {ratings?.quality_remark}
+                            {ratings?.general_remark}
                           </p>
                         </div>
                         <div className="ml-9 text-primary ">
@@ -323,11 +315,9 @@ function TraineePerfomanceDetails() {
                         <div className="m-4">
                           <div className=" ">
                             <input
-                              value={rows.bodyQuality}
                               onChange={(e) =>
                                 setRows({
                                   ...rows,
-                                  bodyQuality: e.target.value,
                                 })
                               }
                               className="w-full bg-inherit px-2 outline-0"
@@ -400,13 +390,13 @@ function TraineePerfomanceDetails() {
                       as="h3"
                       className=" font-medium content-center  text-gray-900 dark:text-dark-text-fill"
                     >
-                      {t('Reply on Professional Remarks')}
+                      {t('Reply on Remarks')}
                     </Dialog.Title>
                     <div className="mt-4 md:mt-8">
                       <div className="w-2/3 flex flex-col border border-gray-200 mb-4 float-left rounded-tr-lg rounded-bl-lg">
                         <div className="m-8">
                           <p className="float-left">
-                            {ratings?.professional_remark}
+                            {ratings?.remark}
                           </p>
                         </div>
                         <div className="ml-9 text-primary ">
@@ -417,11 +407,9 @@ function TraineePerfomanceDetails() {
                         <div className="m-4">
                           <div className=" ">
                             <input
-                              value={rows.bodyProfessional}
                               onChange={(e) =>
                                 setRows({
                                   ...rows,
-                                  bodyProfessional: e.target.value,
                                 })
                               }
                               className="w-full bg-inherit px-2 outline-0"
@@ -483,7 +471,7 @@ function TraineePerfomanceDetails() {
               <tr className="text-black bg-gray-100 dark:bg-dark-tertiary dark:text-dark-text-fill  ">
                 <td className="py-10 px-10 text-left">{t('Remark')}</td>
                 <td className="py-3  text-start text-sm">
-                  {ratings?.quantity_remark}
+                  {ratings?.remark}
                 </td>
               </tr>
             </tbody>
@@ -516,7 +504,7 @@ function TraineePerfomanceDetails() {
               <tr className="text-black bg-gray-100 dark:bg-dark-tertiary dark:text-dark-text-fill  ">
                 <td className="py-10 px-10 text-left">{t('Remark')}</td>
                 <td className="py-3  text-start text-sm">
-                  {ratings?.quality_remark}
+                  {ratings?.remark}
                 </td>
               </tr>
             </tbody>
@@ -551,7 +539,7 @@ function TraineePerfomanceDetails() {
               <tr className="text-black bg-gray-100 dark:bg-dark-tertiary dark:text-dark-text-fill ">
                 <td className="py-10 px-10 text-left">{t('Remark')}</td>
                 <td className="py-3  text-start text-sm">
-                  {ratings?.professional_remark}
+                  {ratings?.remark}
                 </td>
               </tr>
             </tbody>

diff --git a/src/components/ratings/ViewWeeklyRatings.tsx b/src/components/ratings/ViewWeeklyRatings.tsx
@@ -92,15 +92,9 @@ function ViewSprintRatings({
       const ratingChosen: any = selectedSprintRatings[0];
       setRows({
         quality: ratingChosen.quality,
-        qualityremark: '',
         quantity: ratingChosen.quantity,
-        quantityremark: '',
         feedbacks: ratingChosen.feedbacks[0].content,
         professional: ratingChosen.professional_Skills,
-        professionalRemark: '',
-        bodyQuantity: '',
-        bodyQuality: '',
-        bodyProfessional: ratingChosen.professionalRemark,
         sprint: ratingChosen.sprint,
         username: '',
         user: {},
@@ -124,11 +118,8 @@ function ViewSprintRatings({
         user: traineeId,
         sprint: rows.sprint,
         quantity: rows?.quantity,
-        quantityRemark: rows?.quantityremark,
         quality: rows?.quality,
-        qualityRemark: rows?.qualityremark,
         professionalSkills: rows?.professional,
-        professionalRemark: rows?.professionalRemark,
         feedbacks: rows?.feedbacks,
         orgToken: organizationToken,
       };

diff --git a/src/components/ratings/hooks/useAddNewRating.tsx b/src/components/ratings/hooks/useAddNewRating.tsx
@@ -37,11 +37,8 @@ const useAddRating = ({
       user: traineeId,
       sprint: maxSprint + 1,
       quantity: ratingData.quantity.toString(),
-      quantityRemark: '',
       quality: ratingData.quality.toString(),
-      qualityRemark: '',
       professionalSkills: ratingData.professional.toString(),
-      professionalRemark: '',
       orgToken: organizationToken,
     },
     onError: (err) => {