diff --git a/src/Mutations/Ratings.tsx b/src/Mutations/Ratings.tsx index 78168db1..802bbd59 100644 --- 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,11 +59,8 @@ 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! ) { @@ -89,22 +68,16 @@ export const UPDATE_RATING = gql` 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 index eccbce25..389a3ae6 100644 --- 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 index aa7b72df..974fcf55 100644 --- 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 index d4915f51..40ad0bb3 100644 --- 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() { {t('Quality')} {ratings.quality} - {ratings?.quality_remark} + {ratings?.general_remark}