Remove ratings legacy feature #225

atlp-rwanda · Oct 19, 2024 · 87e12a2 · 87e12a2
1 parent 6be314c
commit 87e12a2
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 150 deletions.
diff --git a/src/Mutations/Ratings.tsx b/src/Mutations/Ratings.tsx
@@ -9,11 +9,8 @@ export const ADD_RATING = gql`
     $cohort: String!
     $professionalSkills: String!
     $orgToken: String!
-    $quantityRemark: String
     $bodyQuality: String
-    $qualityRemark: String
     $bodyQuantity: String
-    $professionalRemark: String
     $bodyProfessional: String
   ) {
     addRatings(
@@ -24,11 +21,8 @@ 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 {
@@ -45,7 +39,6 @@ export const ADD_RATING = gql`
         }
       }
       quantity
-      quantityRemark
       feedbacks {
         sender {
           email
@@ -61,10 +54,8 @@ export const ADD_RATING = gql`
       }
       bodyQuantity
       quality
-      qualityRemark
       bodyQuality
       professional_Skills
-      professionalRemark
       bodyProfessional
       approved
       coordinator
@@ -77,34 +68,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 +146,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
@@ -16,9 +16,6 @@ export const ADD_REPLY = gql`
       id
       user
       sprint
-      quantityRemark
-      qualityRemark
-      professionalRemark
       bodyQuantity
       bodyQuality
       bodyProfessional
@@ -36,11 +33,8 @@ export const UPDATE_TO_REPLY = gql`
     $bodyQuantity: [String]
     $bodyProfessional: [String]
     $quantity: [String]
-    $quantityRemark: [String]
     $quality: [String]
-    $qualityRemark: [String]
     $professionalSkills: [String]
-    $professionalRemark: [String]
   ) {
     updateToReply(
       user: $user
@@ -50,23 +44,17 @@ export const UPDATE_TO_REPLY = gql`
       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,15 +15,12 @@ export const GET_RATINGS_DATA = gql`
   query FetchRatingsTrainee {
     fetchRatingsTrainee {
       quality
-      qualityRemark
       bodyQuality
       professional_Skills
       bodyQuantity
-      quantityRemark
       quantity
       average
       sprint
-      professionalRemark
       bodyProfessional
       approved
       ttl
@@ -71,9 +68,6 @@ function TraineePerfomance() {
     sprint: 0,
     username: 'string',
     user: 'string',
-    qualityremark: '',
-    quantityremark: '',
-    professionalRemark: '',
   });
 
   useEffect(() => {
@@ -84,11 +78,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,
@@ -135,9 +126,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
@@ -120,7 +120,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
@@ -312,7 +312,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 ">
@@ -400,13 +400,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 ">
@@ -483,7 +483,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 +516,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 +551,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,11 @@ 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 +120,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) => {

diff --git a/src/pages/AdminRatings.tsx b/src/pages/AdminRatings.tsx
@@ -77,20 +77,14 @@ const TraineeRatingDashboard = () => {
   let [isOpen, setIsOpen] = useState(false);
   const [ratingData, setRatingData] = useState({
     quality: '0',
-    qualityRemark: '',
     quantity: '0',
-    quantityRemark: '',
     professional: '0',
-    professionalRemark: '',
     userEmail: '',
   });
   const [rows, setRows] = useState({
     quality: '0',
-    qualityremark: 'no remarks',
     quantity: '0',
-    quantityremark: 'no remarks',
     professional: '0',
-    professionalRemark: 'no remarks',
     sprint: '0',
     user: '',
     id: '',
@@ -112,11 +106,8 @@ const TraineeRatingDashboard = () => {
       const customHeadings = ratings.map((row: any) => ({
         Email: row.user.email,
         Quality: row.quality,
-        Qualityremark: row.qualityRemark,
         Quantity: row.quantity,
-        Quantityremark: row.quantityRemark,
         Professional: row.professional_Skills,
-        ProfessionalRemark: row.professionalRemark,
         Sprint: row.sprint,
         Cohort: row.cohort.name,
       }));
@@ -144,11 +135,8 @@ const TraineeRatingDashboard = () => {
                 setRows({
                   ...rows,
                   quality: row.original.quality,
-                  qualityremark: row.original.qualityRemark,
                   quantity: row.original.quantity,
-                  quantityremark: row.original.quantityRemark,
                   professional: row.original.professional_Skills,
-                  professionalRemark: row.original.professionalRemark,
                   sprint: row.original.sprint,
                   user: row.original.user.email,
                   id: row.original.user.id,
@@ -238,9 +226,8 @@ const TraineeRatingDashboard = () => {
                       </tr>
                       <tr className="bg-slate-200 dark:text-slate-200 dark:bg-dark-frame-bg border border-spacing-4 border-b-white">
                         <th className="p-4 text-semibold">
-                          {t('Quantity Remarks')}
+                          {t(' Remarks')}
                         </th>
-                        <td>{rows.quantityremark}</td>
                       </tr>
                       <tr className="bg-slate-200 dark:text-slate-200  dark:bg-dark-frame-bg border border-spacing-4 border-b-white">
                         <th className="p-4 text-semibold">
@@ -250,9 +237,8 @@ const TraineeRatingDashboard = () => {
                       </tr>
                       <tr className="bg-slate-200 dark:text-slate-200  dark:bg-dark-frame-bg border border-spacing-4 border-b-white">
                         <th className="p-4 text-semibold">
-                          {t('Quality Remarks')}
+                          {t(' Remarks')}
                         </th>
-                        <td>{rows.qualityremark}</td>
                       </tr>
                       <tr className="bg-slate-200 dark:text-slate-200  dark:bg-dark-frame-bg border border-spacing-4 border-b-white">
                         <th className="p-4 text-semibold">
@@ -262,9 +248,8 @@ const TraineeRatingDashboard = () => {
                       </tr>
                       <tr className="border dark:text-slate-200  dark:bg-dark-frame-bg border-spacing-4 bg-slate-200 border-b-white">
                         <th className="p-4 text-semibold">
-                          {t('Professionalism Remarks')}
+                          {t(' Remarks')}
                         </th>
-                        <td>{rows.professionalRemark}</td>
                       </tr>
                     </table>
                     <div className="flex justify-center mt-4">

diff --git a/src/pages/TraineeDashboard.tsx b/src/pages/TraineeDashboard.tsx
@@ -125,7 +125,6 @@ function SupAdDashboard() {
           quality: string;
           quantity: string;
           professional_Skills: string;
-          professionalRemark: any;
           phase: any;
         }) => ({
           sprint: item.sprint,
@@ -255,7 +254,6 @@ function SupAdDashboard() {
         quality: string;
         quantity: string;
         professional_Skills: string;
-        professionalRemark: any;
         phase: any;
         feedbacks: any;
       }) => ({