Merge pull request #140 from suvarnakale/release-1.0.0

Issue #PS-1704 bug: credentials corrected for facilitator
tekdi · Aug 13, 2024 · 9c81d41 · 9c81d41
2 parents 5b88fbb + 2c19f0f
commit 9c81d41
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/components/AddFacilitator.tsx b/src/components/AddFacilitator.tsx
@@ -155,9 +155,11 @@ const AddFacilitatorModal: React.FC<AddFacilitatorModalprops> = ({
  if (typeof window !== 'undefined' && window.localStorage) {
  fieldData = JSON.parse(localStorage.getItem('fieldData') || '');
  }
+ const yearOfJoining = formData['year of joining scp'];
  const { username, password } = generateUsernameAndPassword(
  fieldData?.state?.stateCode,
- 'F'
+ 'F',
+ yearOfJoining
  );
  setUsername(username);
  setPassword(password);

diff --git a/src/components/AddLeanerModal.tsx b/src/components/AddLeanerModal.tsx
@@ -121,6 +121,7 @@ const AddLearnerModal: React.FC<AddLearnerModalProps> = ({
  }
  const { username, password } = generateUsernameAndPassword(
  fieldData?.state?.stateCode,
+ '',
  ''
  );
  const apiBody: any = {

diff --git a/src/utils/Helper.ts b/src/utils/Helper.ts
@@ -281,14 +281,16 @@ export const accessGranted = (
 
 export const generateUsernameAndPassword = (
  stateCode: string,
- role: string
+ role: string,
+ yearOfJoining: string
 ) => {
  const currentYear = new Date().getFullYear().toString().slice(-2);
  const randomNum = Math.floor(10000 + Math.random() * 90000).toString();
-
+ const yearSuffix =
+ yearOfJoining !== '' ? yearOfJoining.slice(-2) : currentYear;
  const username =
  role === 'F'
- ? `FSC${stateCode}${currentYear}${randomNum}`
+ ? `FSC${stateCode}${yearSuffix}${randomNum}`
  : `SC${stateCode}${currentYear}${randomNum}`;
  const password = randomNum;