diff --git a/app/components/task/holder.hbs b/app/components/task/holder.hbs
index 8332a21c..b6b38809 100644
--- a/app/components/task/holder.hbs
+++ b/app/components/task/holder.hbs
@@ -18,7 +18,7 @@
{{else}}
diff --git a/app/components/task/latest-extension-info.js b/app/components/task/latest-extension-info.js
index c984b29b..aeb1d4f3 100644
--- a/app/components/task/latest-extension-info.js
+++ b/app/components/task/latest-extension-info.js
@@ -1,5 +1,4 @@
import Component from '@glimmer/component';
-import { action } from '@ember/object';
export default class LatestExtensionInfoComponent extends Component {
extension = this.args.extension;
@@ -9,10 +8,4 @@ export default class LatestExtensionInfoComponent extends Component {
localTime(time) {
return new Date(time * 1000).toLocaleString();
}
-
- @action
- closeForm() {
- // Call the closeForm action passed from the parent component
- this.args.closeForm();
- }
}
diff --git a/app/components/task/multiple-extension-form.hbs b/app/components/task/multiple-extension-form.hbs
index cde3b0ae..834cfb76 100644
--- a/app/components/task/multiple-extension-form.hbs
+++ b/app/components/task/multiple-extension-form.hbs
@@ -7,19 +7,27 @@
>
-
{{@title}}
+
+ {{#if this.createExtensionRequest}}
+ Extension Request Form
+ {{else}}
+ Extension Details
+ {{/if}}
+
{{#if this.createExtensionRequest}}
-
Create Extension Request!!!
+ {{!--
Create Extension Request!!!
--}}
{{else}}
@@ -60,7 +68,7 @@
{{else if this.extensionData.error}}
{{this.extensionData.error}}
{{/unless}}
{{/if}}
diff --git a/app/components/task/multiple-extension-form.js b/app/components/task/multiple-extension-form.js
index b71f05c8..e2ec7bfd 100644
--- a/app/components/task/multiple-extension-form.js
+++ b/app/components/task/multiple-extension-form.js
@@ -108,7 +108,7 @@ export default class ExtensionFormComponent extends Component {
e.submitter.disabled = false;
this.disableExtensionRequestClose = false;
this.createExtensionRequestError =
- 'The newEndsOn value cannot be smaller than the oldEndsOn value';
+ 'New ETA must be later than the existing ETA.';
return;
}
json['newEndsOn'] = extensionTime;
@@ -165,7 +165,7 @@ export default class ExtensionFormComponent extends Component {
});
e.target.value = '';
this.createExtensionRequestError =
- 'The newEndsOn value cannot be smaller than the oldEndsOn value';
+ 'New ETA must be later than the existing ETA.';
return;
} else this.createExtensionRequestError = null;
}
diff --git a/app/styles/tasks.css b/app/styles/tasks.css
index 7fa599d1..856a2d1f 100644
--- a/app/styles/tasks.css
+++ b/app/styles/tasks.css
@@ -420,7 +420,7 @@
padding: 18px;
border-radius: 10px;
background-color: var(--white);
- overflow-y: scroll;
+ /* overflow-y: scroll; */
position: absolute;
left: 30%;
right: 30%;
@@ -452,6 +452,7 @@
justify-content: center;
align-items: center;
height: 100%;
+ width: 100%;
flex-direction: column;
margin: 10px 0px;
}
@@ -479,7 +480,7 @@
flex-direction: column;
justify-content: center;
align-items: flex-start;
- width: 80%;
+ width: 100%;
}
.extension-form__content form > label {
font-weight: bold;
@@ -494,7 +495,9 @@
color: var(--button-proceed--text);
font-size: 1.2rem;
border: none;
+ width: 100%;
border-radius: 8px;
+ margin-top: 1rem;
padding: 5px 9px;
}
@@ -511,8 +514,8 @@
margin: 5px 0px 15px 0px;
padding: 5px;
width: 100%;
- border: none;
- border-bottom: 1px solid var(--input-field-border);
+ border: 1px solid var(--input-field-border);
+ /* border-bottom: 1px solid var(--input-field-border); */
}
.extension-info__content > table,
@@ -582,3 +585,69 @@
align-items: center;
}
}
+
+.extension-info__content table td {
+ white-space: normal;
+}
+
+.primary-button-style {
+ background-color: #008000;
+ color: var(--button-proceed--text);
+ font-size: 1.2rem;
+ border: none;
+ border-radius: 8px;
+ padding: 5px 9px;
+ transition: background-color 0.3s ease;
+}
+.multiple-extension-form__open-button {
+ background-color: #008000;
+ color: var(--button-proceed--text);
+ font-size: 1.2rem;
+ border: none;
+ border-radius: 8px;
+ padding: 5px 9px;
+ transition: background-color 0.3s ease;
+}
+
+.multiple-extension-form__create-button {
+ background-color: #008000;
+ color: var(--button-proceed--text);
+ font-size: 1.2rem;
+ border: none;
+ border-radius: 8px;
+ padding: 5px 9px;
+ transition: background-color 0.3s ease;
+}
+
+.multiple-extension-form__open-button:hover {
+ background-color: #01ad01;
+ color: #fff;
+}
+
+.multiple-extension-form__create-button:hover {
+ background-color: #01ad01;
+ color: #fff;
+}
+
+.multiple-extension-form__container-close:hover{
+ background-color: #d50707;
+ color:#fff
+}
+
+.multiple-extension-form__container-close {
+ background-color:#a70606;
+ color: var(--button-proceed--text);
+ font-size: 1.2rem;
+ border: none;
+ border-radius: 8px;
+ padding: 5px 9px;
+}
+.error-container {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+.error-message {
+ color: red;
+ text-align: center;
+}
\ No newline at end of file