Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

master data and field update changes #424

Merged
merged 66 commits into from
Dec 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
d7e71ee
Issue #PS-0000 merge: Merged release-1.0.0 into main
itsvick Oct 14, 2024
5193330
Merge pull request #261 from itsvick/merge-release-1.0.0-to-main
itsvick Oct 14, 2024
587b840
Issue #PS-000 fix: Commented inQuiry editor styles
itsvick Oct 14, 2024
45c12e5
Issue #PS-000 fix: Added fieldId for block and district
itsvick Oct 15, 2024
1e78a38
Issue feat: fix production issues
AkshataKatwal16 Oct 15, 2024
eeb8ca2
Merge pull request #264 from AkshataKatwal16/prod-fix-issue
itsvick Oct 15, 2024
66d1dad
Issue feat: fix selected value for district selection
AkshataKatwal16 Oct 15, 2024
d0493dc
Merge pull request #265 from AkshataKatwal16/prod-fix-issue
itsvick Oct 15, 2024
7d326e6
Issue feat: Fetch proper statename from localstorage while creating …
AkshataKatwal16 Oct 15, 2024
f8eba85
Merge pull request #266 from AkshataKatwal16/prod-fix-issue
itsvick Oct 15, 2024
3485264
Issue feat: fix proad refresh issue on center page
AkshataKatwal16 Oct 15, 2024
47eb841
update pr
AkshataKatwal16 Oct 15, 2024
41c04a4
update pr: set proper values for remote and regular type on edit center
AkshataKatwal16 Oct 15, 2024
7529efd
Merge pull request #267 from AkshataKatwal16/prod-fix-issue
itsvick Oct 15, 2024
47f5111
Issue feat: fetch active and archived learner count on center page
AkshataKatwal16 Oct 15, 2024
20ff273
Merge pull request #268 from AkshataKatwal16/prod-fix-issue
itsvick Oct 15, 2024
6b7a83e
Issue feat: fix empty state value on center page
AkshataKatwal16 Oct 15, 2024
ee0db90
update pr: add form lable values
AkshataKatwal16 Oct 15, 2024
56c9e1a
Merge pull request #269 from AkshataKatwal16/prod-fix-issue
itsvick Oct 15, 2024
bdadac9
Issue feat: Add tstore value in stateDetails
AkshataKatwal16 Oct 15, 2024
c77a192
Issue feat: comment route rediredirection for learner count
AkshataKatwal16 Oct 15, 2024
220102c
Merge pull request #270 from AkshataKatwal16/prod-fix-issue
itsvick Oct 15, 2024
675286e
Merge branch 'release-1.0.0' of github.com:tekdi/shiksha-admin into m…
itsvick Nov 27, 2024
3adb2a4
Merge pull request #358 from tekdi/merge-release-1.0.0-into-main
itsvick Nov 27, 2024
a2b4cd7
Merge branch 'release-1.0.0' of github.com:tekdi/shiksha-admin into m…
itsvick Nov 27, 2024
37f2953
Merge branch 'release-1.0.0' of github.com:tekdi/shiksha-admin into m…
itsvick Nov 27, 2024
eb0f452
Issue #PS-0000 fix: Fixed showing board
itsvick Nov 27, 2024
5f7dd11
Merge branch 'release-1.0.0' of github.com:tekdi/shiksha-admin
itsvick Nov 28, 2024
51c4022
Merge branch 'release-1.0.0' of github.com:tekdi/shiksha-admin
itsvick Nov 29, 2024
fe1b0c0
Merge branch 'release-1.0.0' of github.com:tekdi/shiksha-admin
itsvick Nov 29, 2024
3b74481
Merge branch 'release-1.0.0' of github.com:tekdi/shiksha-admin
itsvick Nov 30, 2024
24f8f64
Merge branch 'release-1.0.0' of github.com:tekdi/shiksha-admin
itsvick Nov 30, 2024
06caeea
Merge branch 'release-1.0.0' of github.com:tekdi/shiksha-admin
itsvick Nov 30, 2024
087a49f
Issue #PS-0000 fix: Handled comparions
itsvick Nov 30, 2024
a5c8350
Merge branch 'release-1.0.0' of github.com:tekdi/shiksha-admin
itsvick Nov 30, 2024
e93f629
Merge branch 'release-1.0.0' of github.com:tekdi/shiksha-admin
itsvick Nov 30, 2024
9d18bcf
Merge branch 'release-1.0.0' of github.com:tekdi/shiksha-admin
itsvick Dec 1, 2024
02756c2
Issue #PS-0000 fix: Fixed UI
itsvick Dec 1, 2024
858cfd8
Merge pull request #372 from Aar-if/seventy
itsvick Dec 1, 2024
846a62c
Merge branch 'release-1.0.0' of github.com:tekdi/shiksha-admin
itsvick Dec 1, 2024
57e3e0b
Merge branch 'main' of github.com:tekdi/shiksha-admin
itsvick Dec 2, 2024
877940d
Merge branch 'release-1.0.0' of github.com:tekdi/shiksha-admin
itsvick Dec 2, 2024
8b8a104
Merge branch 'release-1.0.0' of github.com:tekdi/shiksha-admin
itsvick Dec 2, 2024
5c07049
Issue #PS-0000 fix: Fixed Language constant
itsvick Dec 2, 2024
589e1d9
Merge branch 'release-1.0.0' of github.com:tekdi/shiksha-admin
itsvick Dec 2, 2024
bafb553
Merge branch 'release-1.0.0' of github.com:tekdi/shiksha-admin
itsvick Dec 2, 2024
a74d7fe
Merge branch 'release-1.0.0' of github.com:tekdi/shiksha-admin
itsvick Dec 2, 2024
803e134
Merge branch 'release-1.0.0' of github.com:tekdi/shiksha-admin
itsvick Dec 2, 2024
4dcccb7
Merge branch 'release-1.0.0' of github.com:tekdi/shiksha-admin
itsvick Dec 3, 2024
33ec185
Merge branch 'release-1.0.0' of github.com:tekdi/shiksha-admin
itsvick Dec 3, 2024
872d534
Issue #PS-0000 fix: Fixed base url of editor
itsvick Dec 3, 2024
0fabb14
Merge branch 'release-1.0.0' of github.com:tekdi/shiksha-admin
itsvick Dec 3, 2024
5e541b0
Issue #PS-0000 fix: Updated portal base url
itsvick Dec 4, 2024
39bb3a4
Issue #PS-0000 fix: Updated main
itsvick Dec 11, 2024
b16d33e
Merge branch 'main' of github.com:tekdi/shiksha-admin
itsvick Dec 11, 2024
1b3ecbf
Merge branch 'release-1.0.0' of github.com:tekdi/shiksha-admin
itsvick Dec 11, 2024
3d97f93
Merge branch 'release-1.0.0' of github.com:tekdi/shiksha-admin
itsvick Dec 11, 2024
6c462e3
Issue feat:Resolve reload issue after deletion of block
AkshataKatwal16 Dec 12, 2024
d8b08df
Merge pull request #420 from AkshataKatwal16/relese-changes
itsvick Dec 12, 2024
54bb459
Merge branch 'main' of github.com:tekdi/shiksha-admin into piolet-cha…
AkshataKatwal16 Dec 13, 2024
bccb9cb
Issue feat:Fix master data active district issue and add number of c…
AkshataKatwal16 Dec 13, 2024
61e410d
update pr
AkshataKatwal16 Dec 13, 2024
8e8f133
update pr
AkshataKatwal16 Dec 13, 2024
ee169b4
update pr
AkshataKatwal16 Dec 13, 2024
0f0d15a
update pr
AkshataKatwal16 Dec 13, 2024
c6adea3
update
AkshataKatwal16 Dec 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/components/AddBlockModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@ export const AddBlockModal: React.FC<AddBlockModalProps> = ({
filters: {
states: stateCode,
type: CohortTypes.DISTRICT,
status:["active"]

},
};

Expand Down
4 changes: 1 addition & 3 deletions src/components/CommonUserModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,7 @@ console.log("userType",userType, FormContextType.CONTENT_CREATOR)
if (userType === FormContextType.TEACHER) {
const newResponse = {
...response,
fields: response?.fields?.filter(
(field: any) => field.name !== "no_of_clusters"
),
fields: response?.fields
};
const { schema, uiSchema, formValues } = GenerateSchemaAndUiSchema(
newResponse,
Expand Down
2 changes: 2 additions & 0 deletions src/pages/block.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -689,6 +689,8 @@ const Block: React.FC = () => {
)
);
showToastMessage(t("COMMON.BLOCK_DELETED_SUCCESS"), "success");
filteredCohortOptionData();
fetchBlocks();
const windowUrl = window.location.pathname;
const cleanedUrl = windowUrl.replace(/^\//, '');
const env = cleanedUrl.split("/")[0];
Expand Down