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.

Sign up for GitHub

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

Revert "Some fixes" #326

Merged
merged 2 commits into from
Sep 1, 2024
Merged

Revert "Some fixes" #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4db5e47
Revert "Some fixes"
yashlm Aug 30, 2024
f9c6335
Merge branch 'main' into revert-325-main
yashlm Sep 1, 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: 1 addition & 1 deletion components/Utils/matrixUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ export const func = {
"Cognitive Science (CGS)": {
BT: -1,
BS: -1,
MT: -1,
MT: 117,
DoubleMajor: -1,
DualA: -1,
DualB: -1,
Expand Down
14 changes: 14 additions & 0 deletions pages/admin/rc/[rcid]/proforma/[proformaid]/view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,6 +711,19 @@ function View() {
/>
</Grid>
)}
<Grid item xs={12} md={6} key="cpi" padding={0}>
<h4>CPI Criteria</h4>
<TextField
multiline
fullWidth
value={row.cpi_criteria}
InputProps={{
style: { textAlign: "center" },
readOnly: true,
}}
sx={textFieldSX}
/>
</Grid>
<Grid item xs={12} md={6} key="int-per" padding={0}>
<h4>Preferred period of Internship</h4>
<TextField
Expand Down Expand Up @@ -806,6 +819,7 @@ function View() {
<TextField
multiline
fullWidth
minRows={4}
value={row.perks}
InputProps={{
style: { textAlign: "center" },
Expand Down
4 changes: 2 additions & 2 deletions pages/admin/rc/[rcid]/pvf/[pvfid]/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ function AdminPvfView() {
<CloudDownloadIcon sx={{ marginRight: "10px" }} />
<span>View Student Uploaded PVF</span>
</Button>
<Button
{/* <Button
disabled={row?.filename_mentor === ""}
variant="contained"
onClick={() => {
Expand All @@ -232,7 +232,7 @@ function AdminPvfView() {
>
<CloudDownloadIcon sx={{ marginRight: "10px" }} />
<span>View Mentor Uploaded PVF</span>
</Button>
</Button> */}
</Grid>
{/* removed for now */}
<Grid item xs={12} md={12} key="status" padding={0}>
Expand Down
69 changes: 66 additions & 3 deletions pages/student/rc/[rcid]/proforma/[proformaId]/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ function Index() {
/>
</Grid>
<Grid item xs={12} md={6} key="tjobloc">
<h3>Tentative Job Location</h3>
<h3>Tentative Job Location/Online</h3>
<TextField
multiline
fullWidth
Expand All @@ -117,16 +117,79 @@ function Index() {
sx={textFieldSX}
/>
</Grid>
<Grid item xs={12} md={6} key="tjobloc">
<h3>Required Skill Set</h3>
<TextField
multiline
fullWidth
minRows={4}
value={row.skill_set}
InputProps={{
readOnly: true,
}}
sx={textFieldSX}
/>
</Grid>
<Grid item xs={12} md={6} key="tjobloc">
<h3>Accomodation Provided / Trip Fare</h3>
<TextField
multiline
fullWidth
minRows={4}
value={row.accommodation}
InputProps={{
readOnly: true,
}}
sx={textFieldSX}
/>
</Grid>
<Grid item xs={12} md={6} key="tjobloc">
<h3>Preferred Period of Internship</h3>
<TextField
multiline
fullWidth
minRows={4}
value={row.internship_period}
InputProps={{
readOnly: true,
}}
sx={textFieldSX}
/>
</Grid>
<Grid item xs={12} md={6} key="bnature">
<h3>Stipend (INR)</h3>
<TextField
multiline
fullWidth
value={row.ctc_inr}
InputProps={{
readOnly: true,
}}
sx={textFieldSX}
/>
</Grid>
<Grid item xs={12} md={6} key="bnature">
<h3>Stipend (Foreign Currency)</h3>
<TextField
multiline
fullWidth
value={row.ctc_fr}
InputProps={{
readOnly: true,
}}
sx={textFieldSX}
/>
</Grid>
<Grid item xs={12} md={12} key="jd">
<h3>Job Description</h3>
{isFetched && <RichText onChange={setJd} readOnly value={jd} />}
</Grid>
<Grid item xs={12} md={12} key="ctc">
<h3>Cost to Company</h3>
<h3>Tentative CTC for PPO</h3>
{isFetched && <RichText onChange={setCtc} readOnly value={ctc} />}
</Grid>
<Grid item xs={12} md={12} key="pd">
<h3>Package Details</h3>
<h3>PPO provision on performance</h3>
{isFetched && <RichText onChange={setPd} readOnly value={pd} />}
</Grid>
<Grid item xs={12} md={6} key="bond">
Expand Down
4 changes: 2 additions & 2 deletions pages/student/rc/[rcid]/pvf/[pvfid]/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ function View() {
<CloudDownloadIcon sx={{ marginRight: "10px" }} />
<span>View Student Uploaded PVF</span>
</Button>
<Button
{/* <Button
disabled={row?.filename_mentor === ""}
variant="contained"
onClick={() => {
Expand All @@ -198,7 +198,7 @@ function View() {
>
<CloudDownloadIcon sx={{ marginRight: "10px" }} />
<span>View Mentor Uploaded PVF</span>
</Button>
</Button> */}
</Grid>
{/* removed for now */}
{/* <Grid item xs={12} md={12} key="status" padding={0}>
Expand Down
Loading
Loading