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

Jump to bottom

HLM-5167 HLM-5158 adding navigation and respective restrictions #257

Merged
merged 7 commits into from
Apr 4, 2024
Merged

HLM-5167 HLM-5158 adding navigation and respective restrictions #257

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d04bbc5
HLM-5167 HLM-5158 adding navigation and respective restrictions
siddhant-nawale-egov Apr 3, 2024
0e9b345
HLM-5167 adding review changes
siddhant-nawale-egov Apr 4, 2024
7185f07
HLM-5167 adding review changes
siddhant-nawale-egov Apr 4, 2024
69fe078
HLM-5167 adding ui component css in web public file
siddhant-nawale-egov Apr 4, 2024
8129450
HLM-5167 created a separate navigator component
siddhant-nawale-egov Apr 4, 2024
a8eb928
HLM-5167 adding review changes
siddhant-nawale-egov Apr 4, 2024
9274748
HLM-5167 changing buttontype2 porps
siddhant-nawale-egov Apr 4, 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
1 change: 1 addition & 0 deletions micro-ui/web/micro-ui-internals/example/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<meta name="theme-color" content="#00bcd1" />
<title>DIGIT</title>
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />

<!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" /> -->

Expand Down
2 changes: 1 addition & 1 deletion micro-ui/web/micro-ui-internals/packages/css/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-css",
"version": "1.0.7-microplan",
"version": "1.0.8-microplan",
"license": "MIT",
"main": "dist/index.css",
"author": "Jagankumar <[email protected]>",
Expand Down
138 changes: 90 additions & 48 deletions micro-ui/web/micro-ui-internals/packages/css/src/components/microplanning.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
$box-shadow-color: #00000029;
$border-color: rgba(214, 213, 212, 1);
$highlight-color: rgba(244, 119, 56, 1);
$highlight-color: rgba(244, 119, 56, 1);
$border-color: rgba(214, 213, 212, 1);


.navigator-componet-not-found {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
padding: 2rem;
font-weight: 700;
font-size: 2rem;
color: rgb(0, 0, 0);
}


.modal-header {
width: 30rem;
font-weight: 700;
Expand Down Expand Up @@ -96,15 +115,15 @@
background-color: #ffffff;
border-top-left-radius: 0.5rem;
border-bottom-left-radius: 0.5rem;
box-shadow: 0px 1px 2px 0px #00000029;
box-shadow: 0 0.063rem 0.125rem 0 $box-shadow-color;
}

.upload-section-options-active,
.upload-section-options-inactive {
min-height: 3.7rem;
display: flex;
align-items: center;
border-bottom: 1px rgba(214, 213, 212, 1) solid;
border-bottom: 0.063rem $border-color solid;
cursor: pointer;

p {
Expand Down Expand Up @@ -165,7 +184,7 @@
color: rgba(177, 180, 182, 1);
margin: 0 0.625rem;
font-size: 1.25rem;
padding-top: 0px;
padding-top: 0;
font-weight: 500;
}

Expand Down Expand Up @@ -202,7 +221,7 @@
align-items: center !important;
min-width: 13.5rem;
height: 2.5rem;
border: 1px rgba(244, 119, 56, 1) solid;
border: 0.063rem $highlight-color solid;

.icon {
display: flex;
Expand Down Expand Up @@ -234,7 +253,7 @@
flex-wrap: wrap;

.upload-option-container-selected {
border: 2px rgba(244, 119, 56, 1) solid;
border: 0.125rem $highlight-color solid;
color: rgba(244, 119, 56, 1);
}
}
Expand All @@ -255,21 +274,24 @@
cursor: pointer;

&:hover {
border: 2px rgba(244, 119, 56, 1) solid;
border: 0.125rem $highlight-color solid;
p{
color: rgba(244, 119, 56, 1);
}
}

p {
margin-top: 0.625rem;
}

.upload-option-selected {
border: 0.125rem rgba(244, 119, 56, 1) solid;
border: 0.125rem $highlight-color solid;
color: rgba(244, 119, 56, 1);
}

.select-button {
justify-self: end;
border: 1px solid rgba(244, 119, 56, 1);
border: 0.063rem solid $highlight-color;
background-color: rgba(255, 255, 255, 1);
width: 11rem;
height: 2.5rem;
Expand All @@ -285,7 +307,7 @@
align-items: center !important;
justify-self: end;
justify-content: center;
border: 1px solid rgba(244, 119, 56, 1);
border: 0.063rem solid $highlight-color;
background-color: rgba(244, 119, 56, 1);
width: 11rem;
height: 2.5rem;
Expand All @@ -300,7 +322,7 @@
min-width: 90%;
min-height: 10rem;
padding-top: 0.625;
border: 1px rgba(214, 213, 212, 1);
border: 0.063rem $border-color;
margin: 1rem 0;
display: flex !important;
flex-direction: column;
Expand Down Expand Up @@ -332,7 +354,7 @@
}

.uploaded-file {
border: 1px solid rgba(214, 213, 212, 1);
border: 0.063rem solid $border-color;
min-height: 4.75rem;
background-color: rgb(256, 252, 252);
display: flex !important;
Expand Down Expand Up @@ -376,7 +398,7 @@
margin-left: 1rem;
min-width: 9rem;
height: 2.5rem;
border: 1px rgba(244, 119, 56, 1) solid;
border: 0.063rem $highlight-color solid;
background-color: white;
cursor: pointer;
}
Expand Down Expand Up @@ -423,7 +445,7 @@
}

.file-upload-error-container {
border: 1px solid rgba(214, 213, 212, 1);
border: 0.063rem solid $border-color;
min-height: 4.75rem;
display: flex !important;
flex-direction: column;
Expand Down Expand Up @@ -609,7 +631,7 @@
padding: 1rem 0.5rem;
display: flex;
flex-direction: column;
gap: 20px;
gap: 1.25rem;
background-color: white !important;
border: 0.063rem rgba(0, 0, 0, 0.16) solid !important;
border-radius: 0.25rem;
Expand All @@ -633,8 +655,8 @@

&::-webkit-scrollbar-thumb {
background: rgba(177, 180, 182, 1);
border-radius: 10px;
border: 2px solid #f0f0f0;
border-radius: 0.625rem;
border: 0.125rem solid #f0f0f0;
}

&::-webkit-scrollbar-thumb:hover {
Expand All @@ -643,18 +665,18 @@

h3 {
background-color: #f4f4f4;
padding: 10px;
padding: 0.625rem;
margin: 0;
}

.excel-table {
width: 100%;
border: 1px solid #ccc;
border: 0.063rem solid #ccc;
border-collapse: collapse;

th,
td {
border: 1px solid #ccc;
border: 0.063rem solid #ccc;
padding: 8px;
font-family: Arial, sans-serif;
font-size: 14px;
Expand Down Expand Up @@ -764,7 +786,10 @@
width: 100%;
background-color: rgb(255, 255, 255);
padding: 1.3rem;
margin-top: 1.3rem;
height: 33.5rem;
border-radius: 0.25rem;
box-shadow: 0 0.063rem 0.125rem 0 rgba(0, 0, 0, 0.16);

.add-icon {
background-color: rgba(244, 119, 56, 1);
Expand Down Expand Up @@ -821,8 +846,8 @@

&::-webkit-scrollbar-thumb {
background: rgba(177, 180, 182, 1);
border-radius: 10px;
border: 2px solid #f0f0f0;
border-radius: 10;
border: 0.125rem solid #f0f0f0;
}

&::-webkit-scrollbar-thumb:hover {
Expand Down Expand Up @@ -913,13 +938,13 @@
align-items: center;
}

.select-and-input-wrapper-first{
.select-and-input-wrapper-first {
margin-top: 0.8rem;
width: 100%;
display: flex;
align-items: center;
}


.headerbar {
padding: 0;
Expand Down Expand Up @@ -979,7 +1004,7 @@
-webkit-appearance: none;
-moz-appearance: none;
width: 100%;
border: 1px solid rgba(80, 90, 95, 1);
border: 0.063rem solid rgba(80, 90, 95, 1);
background-color: rgb(255, 255, 255, 0);
padding: 0.5rem;
font-weight: 400;
Expand Down Expand Up @@ -1013,7 +1038,7 @@
align-items: center;
justify-content: center;
background: rgba(255, 255, 255, 1);
border: 0.063rem solid rgba(244, 119, 56, 1);
border: 0.063rem solid $highlight-color;

p {
color: rgba(244, 119, 56, 1);
Expand All @@ -1031,6 +1056,7 @@
.rule-engine-section {
display: flex;
flex-direction: column;
margin-top: 1.3rem;

.rule-engine-body {
font-family: Roboto;
Expand All @@ -1041,7 +1067,8 @@
background-color: rgb(255, 255, 255);
padding: 1.3rem;
height: 33.5rem;

box-shadow: 0 0.063rem 0.125rem 0 rgba(0, 0, 0, 0.16);
border-radius: 0.25rem;

.heading {
padding: 0.5rem 0;
Expand Down Expand Up @@ -1079,8 +1106,8 @@

&::-webkit-scrollbar-thumb {
background: rgba(177, 180, 182, 1);
border-radius: 10px;
border: 2px solid #f0f0f0;
border-radius: 10;
border: 0.125rem solid #f0f0f0;
}

&::-webkit-scrollbar-thumb:hover {
Expand Down Expand Up @@ -1171,14 +1198,14 @@
align-items: center;
}

.select-and-input-wrapper-first{
.select-and-input-wrapper-first {
margin-top: 0rem;
width: 100%;
display: flex;
align-items: center;
}
.user-input-wrapper{

.user-input-wrapper {
width: 100%;
}

Expand Down Expand Up @@ -1225,7 +1252,7 @@
-webkit-appearance: none;
-moz-appearance: none;
width: 100%;
border: 1px solid rgba(80, 90, 95, 1);
border: 0.063rem solid rgba(80, 90, 95, 1);
background-color: rgb(255, 255, 255, 0);
padding: 0.5rem;
font-weight: 400;
Expand Down Expand Up @@ -1274,7 +1301,7 @@
align-items: center;
justify-content: center;
background: rgba(255, 255, 255, 1);
border: 0.063rem solid rgba(244, 119, 56, 1);
border: 0.063rem solid $highlight-color;

p {
color: rgba(244, 119, 56, 1);
Expand Down Expand Up @@ -1341,24 +1368,39 @@
}
}
}
}


.create-microplan {

.next-previous-bar {
display: flex;
bottom: 0;
left: 0;
/* Adjust as needed */
width: 100%;
/* Adjust as needed */
background-color: #ffffff;
/* Adjust as needed */
padding: 10px;
/* Adjust as needed */
box-shadow: rgba(0, 0, 0, 0.16) 0 -2px 8px;
max-width: 480px;
z-index: 100;
text-align: right;
.custom-action-bar,
.custom-action-bar-no-first-button {
padding: 1.5rem 1.5rem 1.5rem 5.3rem;
display: flex !important;
justify-content: space-between;
align-items: center;
height: 5.5rem;

.custom-button {
width: 12.5rem;
border: 0.063rem red solid;
display: flex;
justify-content: center;
align-items: center;

h2 {
width: fit-content !important;
}

.icon {
margin: 0 0 0 1rem !important;
}
}

}

.custom-action-bar-no-first-button {
justify-content: end;
}

}
1 change: 1 addition & 0 deletions micro-ui/web/micro-ui-internals/packages/modules/hcm-microplanning/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
},
"dependencies": {
"@cyntler/react-doc-viewer": "1.10.3",
"@egovernments/digit-ui-components": "^0.0.1-beta.2",
"@egovernments/digit-ui-react-components": "1.8.1-beta.9",
"@egovernments/digit-ui-svg-components": "1.0.5",
"@rjsf/core": "5.10.0",
Expand Down
Loading