fix: adjusted edit Units/Projects

Chia-Network · Jan 31, 2022 · 786d213 · 786d213
1 parent c5903a4
commit 786d213
Show file tree

Hide file tree

Showing 17 changed files with 461 additions and 173 deletions.
diff --git a/src/components/blocks/YearSelect.js b/src/components/blocks/YearSelect.js
@@ -63,7 +63,7 @@ const YearSelect = ({ size, yearValue, setYearValue }) => {
       <DatePicker
         views={['year']}
         label="Year"
-        value={yearValue}
+        value={yearValue ? `${yearValue}`: yearValue}
         onChange={newValue => {
           setYearValue(`${newValue.$y}`);
         }}
@@ -76,6 +76,7 @@ const YearSelect = ({ size, yearValue, setYearValue }) => {
           );
         }}
       />
+      {console.log(yearValue)}
     </LocalizationProvider>
   );
 };

diff --git a/src/components/forms/CreateEstimationsForm.js b/src/components/forms/CreateEstimationsForm.js
@@ -0,0 +1,181 @@
+import u from 'updeep';
+import React from 'react';
+import styled from 'styled-components';
+import { useIntl, FormattedMessage } from 'react-intl';
+
+import {
+  StandardInput,
+  InputSizeEnum,
+  InputStateEnum,
+  Divider,
+  ModalFormContainerStyle,
+  FormContainerStyle,
+  BodyContainer,
+  Body,
+  DescriptionIcon,
+  ToolTipContainer,
+  DateSelect,
+} from '..';
+import { LabelContainer } from '../../utils/compUtils';
+
+const StyledLabelContainer = styled('div')`
+  margin-bottom: 0.5rem;
+`;
+
+const StyledFieldContainer = styled('div')`
+  padding-bottom: 1.25rem;
+`;
+
+const InputContainer = styled('div')`
+  width: 20rem;
+`;
+
+const CreateEstimationsForm = ({ value, onChange }) => {
+  console.log(value);
+  const intl = useIntl();
+  const onInputChange = (field, changeValue) => {
+    onChange(u({ [field]: changeValue }, value));
+  };
+
+  return (
+    <ModalFormContainerStyle>
+      <FormContainerStyle>
+        <BodyContainer>
+          <StyledFieldContainer>
+            <StyledLabelContainer>
+              <Body style={{ color: '#262626' }}>
+                <LabelContainer>
+                  <FormattedMessage id="crediting-period-start" />
+                </LabelContainer>
+                <ToolTipContainer
+                  tooltip={intl.formatMessage({
+                    id: 'estimations-crediting-period-start-description',
+                  })}>
+                  <DescriptionIcon height="14" width="14" />
+                </ToolTipContainer>
+              </Body>
+            </StyledLabelContainer>
+            <InputContainer>
+              <DateSelect
+                size="large"
+                dateValue={value.creditingPeriodStart}
+                setDateValue={changeValue =>
+                  onInputChange('creditingPeriodStart', changeValue)
+                }
+              />
+            </InputContainer>
+          </StyledFieldContainer>
+          <StyledFieldContainer>
+            <StyledLabelContainer>
+              <Body style={{ color: '#262626' }}>
+                <LabelContainer>
+                  <FormattedMessage id="crediting-period-end" />
+                </LabelContainer>
+                <ToolTipContainer
+                  tooltip={intl.formatMessage({
+                    id: 'estimations-crediting-period-end-description',
+                  })}>
+                  <DescriptionIcon height="14" width="14" />
+                </ToolTipContainer>
+              </Body>
+            </StyledLabelContainer>
+            <InputContainer>
+              <DateSelect
+                size="large"
+                dateValue={value.creditingPeriodEnd}
+                setDateValue={changeValue =>
+                  onInputChange('creditingPeriodEnd', changeValue)
+                }
+              />
+            </InputContainer>
+          </StyledFieldContainer>
+          <StyledFieldContainer>
+            <StyledLabelContainer>
+              <Body style={{ color: '#262626' }}>
+                <LabelContainer>
+                  <FormattedMessage id="unit-count" />
+                </LabelContainer>
+                <ToolTipContainer
+                  tooltip={intl.formatMessage({
+                    id: 'ratings-unit-count-description',
+                  })}>
+                  <DescriptionIcon height="14" width="14" />
+                </ToolTipContainer>
+              </Body>
+            </StyledLabelContainer>
+            <InputContainer>
+              <StandardInput
+                size={InputSizeEnum.large}
+                placeholderText={intl.formatMessage({
+                  id: 'unit-count',
+                })}
+                state={InputStateEnum.default}
+                value={value.unitCount}
+                onChange={changeValue =>
+                  onInputChange('unitCount', changeValue)
+                }
+              />
+            </InputContainer>
+          </StyledFieldContainer>
+        </BodyContainer>
+        <div style={{ display: 'flex', flexDirection: 'column' }}>
+          <StyledFieldContainer>
+            <StyledLabelContainer>
+              <Body style={{ color: '#262626' }}>
+                <LabelContainer>
+                  <FormattedMessage id="verification-date" />
+                </LabelContainer>
+                <ToolTipContainer
+                  tooltip={intl.formatMessage({
+                    id: 'ratings-verification-date-description',
+                  })}>
+                  <DescriptionIcon height="14" width="14" />
+                </ToolTipContainer>
+              </Body>
+            </StyledLabelContainer>
+            <InputContainer>
+              <DateSelect
+                size="large"
+                dateValue={value.verificationDate}
+                setDateValue={changeValue =>
+                  onInputChange('verificationDate', changeValue)
+                }
+              />
+            </InputContainer>
+          </StyledFieldContainer>
+          <StyledFieldContainer>
+            <StyledLabelContainer>
+              <Body style={{ color: '#262626' }}>
+                <LabelContainer>
+                  <FormattedMessage id="verification-body" />
+                </LabelContainer>
+                <ToolTipContainer
+                  tooltip={intl.formatMessage({
+                    id: 'ratings-verification-body-description',
+                  })}>
+                  <DescriptionIcon height="14" width="14" />
+                </ToolTipContainer>
+              </Body>
+            </StyledLabelContainer>
+            <InputContainer>
+              <StandardInput
+                size={InputSizeEnum.large}
+                placeholderText={intl.formatMessage({
+                  id: 'verification-body',
+                })}
+                state={InputStateEnum.default}
+                value={value.verificationBody}
+                onChange={changeValue =>
+                  onInputChange('verificationBody', changeValue)
+                }
+              />
+            </InputContainer>
+          </StyledFieldContainer>
+        </div>
+      </FormContainerStyle>
+      <Divider />
+    </ModalFormContainerStyle>
+  );
+};
+
+export { CreateEstimationsForm };
diff --git a/src/components/forms/CreateIssuanceForm.js b/src/components/forms/CreateIssuanceForm.js
@@ -123,11 +123,11 @@ const CreateIssuanceForm = ({ value, onChange }) => {
             <StyledLabelContainer>
               <Body style={{ color: '#262626' }}>
                 <LabelContainer>
-                  <FormattedMessage id="verification-date" />
+                  <FormattedMessage id="verification-report-date" />
                 </LabelContainer>
                 <ToolTipContainer
                   tooltip={intl.formatMessage({
-                    id: 'issuances-verification-date-description',
+                    id: 'issuances-verification-report-date-description',
                   })}>
                   <DescriptionIcon height="14" width="14" />
                 </ToolTipContainer>
@@ -136,14 +136,13 @@ const CreateIssuanceForm = ({ value, onChange }) => {
             <InputContainer>
               <DateSelect
                 size="large"
-                dateValue={value.verificationDate}
+                dateValue={value.verificationReportDate}
                 setDateValue={changeValue =>
-                  onInputChange('verificationDate', changeValue)
+                  onInputChange('verificationReportDate', changeValue)
                 }
               />
             </InputContainer>
           </StyledFieldContainer>
-
           <StyledFieldContainer>
             <StyledLabelContainer>
               <Body style={{ color: '#262626' }}>

diff --git a/src/components/forms/CreateLabelsForm.js b/src/components/forms/CreateLabelsForm.js
@@ -64,6 +64,34 @@ const CreateLabelsForm = ({ value, onChange }) => {
               />
             </InputContainer>
           </StyledFieldContainer>
+          <StyledFieldContainer>
+            <StyledLabelContainer>
+              <Body style={{ color: '#262626' }}>
+                <LabelContainer>
+                  <FormattedMessage id="label-type" />
+                </LabelContainer>
+                <ToolTipContainer
+                  tooltip={intl.formatMessage({
+                    id: 'labels-label-type-description',
+                  })}>
+                  <DescriptionIcon height="14" width="14" />
+                </ToolTipContainer>
+              </Body>
+            </StyledLabelContainer>
+            <InputContainer>
+              <StandardInput
+                size={InputSizeEnum.large}
+                placeholderText={intl.formatMessage({
+                  id: 'label-type',
+                })}
+                state={InputStateEnum.default}
+                value={value.labelType}
+                onChange={event => {
+                  onChange({ ...value, labelType: event });
+                }}
+              />
+            </InputContainer>
+          </StyledFieldContainer>
           <StyledFieldContainer>
             <StyledLabelContainer>
               <Body style={{ color: '#262626' }}>

diff --git a/src/components/forms/CreateProjectForm.js b/src/components/forms/CreateProjectForm.js
@@ -60,7 +60,6 @@ const CreateProjectForm = withRouter(({ onClose }) => {
   };
 
   const [newProject, setNewProject] = useState({
-    currentRegistry: '',
     projectId: '',
     registryOfOrigin: '',
     program: '',
@@ -109,7 +108,7 @@ const CreateProjectForm = withRouter(({ onClose }) => {
     if (!_.isEmpty(newRelatedProjects)) {
       dataToSend.relatedProjects = newRelatedProjects;
     }
-
+    console.log(dataToSend);
     dispatch(postNewProject(dataToSend));
   };
 
@@ -177,37 +176,6 @@ const CreateProjectForm = withRouter(({ onClose }) => {
                 <ModalFormContainerStyle>
                   <FormContainerStyle>
                     <BodyContainer>
-                      <StyledFieldContainer>
-                        <StyledLabelContainer>
-                          <Body color={'#262626'}>
-                            <LabelContainer>
-                              <FormattedMessage id="current-registry" />
-                            </LabelContainer>
-                            <ToolTipContainer
-                              tooltip={intl.formatMessage({
-                                id: 'projects-current-registry-description',
-                              })}>
-                              <DescriptionIcon height="14" width="14" />
-                            </ToolTipContainer>
-                          </Body>
-                        </StyledLabelContainer>
-                        <InputContainer>
-                          <StandardInput
-                            size={InputSizeEnum.large}
-                            placeholderText={intl.formatMessage({
-                              id: 'current-registry',
-                            })}
-                            state={InputStateEnum.default}
-                            value={newProject.currentRegistry}
-                            onChange={value =>
-                              setNewProject(prev => ({
-                                ...prev,
-                                currentRegistry: value,
-                              }))
-                            }
-                          />
-                        </InputContainer>
-                      </StyledFieldContainer>
                       <StyledFieldContainer>
                         <StyledLabelContainer>
                           <Body style={{ color: '#262626' }}>
@@ -742,8 +710,8 @@ const CreateProjectForm = withRouter(({ onClose }) => {
               </TabPanel>
               <TabPanel value={tabValue} index={4}>
                 <LocationsRepeater
-                  projectLocationsState={newProjectLocations}
-                  setProjectLocationsState={setNewProjectLocations}
+                  locationsState={newProjectLocations}
+                  setLocationsState={setNewProjectLocations}
                 />
               </TabPanel>
               <TabPanel value={tabValue} index={5}>

diff --git a/src/components/forms/CreateUnitsForm.js b/src/components/forms/CreateUnitsForm.js
@@ -124,7 +124,6 @@ const CreateUnitsForm = withRouter(({ onClose }) => {
         selectedCorrespondingAdjustmentDeclaration[0].value;
     }
     if (!_.isEmpty(year)) {
-      console.log(year);
       dataToSend.vintageYear = year;
     }
     if (!_.isEmpty(selectedCorrespondingAdjustmentStatus)) {