Added funded line, ability to edit groups, and fixed what was ailing … #619

laredotornado · 2020-05-22T18:58:48Z

…volunteer selection.

Related to this ticket ...

…volunteer selection.

jwu910

Still lots of debugging code you left in, we'll need to have them removed. Can you also remove all the lint warnings before we move forward?

jwu910 · 2020-05-22T19:38:54Z

src/app/dashboard/Missions/MissionEditView.jsx

  );

  const props = { classes, mission };

  const volunteerEditable = volunteerStatus.includes(mission.status);

+  useEffect(() => {
+    document.getElementById("pickup-address-id").value = values.pickUpLocation?.address;
+    document.getElementById("delivery-address-id").value = values.deliveryLocation?.address;


Im not 100% sure I'm following the logic and reasoning to update this value.

I think what you're trying to achieve can be solved by by these elements setting their values based on state or props instead.

There aren't many cases where we need to use document.getElementById. Majority of use cases can be solved with react element refs.

If you're just trying to set the value of the address input I had previously added the value prop which you can use instead

You're goign to have to spell it out for me. I don't know how to set the default value of the AddressInputElement without doing the above. Whatever you want me to insert, I'll do it.

Ok, @qdozaq instructed me on the proper way to do this, so this shoudl also now be addressed now.

jwu910 · 2020-05-22T19:39:19Z

src/app/dashboard/Missions/MissionEditView.jsx

@@ -226,14 +207,28 @@ const MissionEditView = ({ mission, toDetailsView, toListView, volunteers }) =>
    date: values.deliveryWindow.startTime,
    location: "",
  });
+  console.log("mission tentative:" + mission.tentativeVolunteerUid);
+  console.log(mission);


Be sure to review your commits before you submit a PR to remove debug console logs

Oops, my bad, this is gone.

jwu910 · 2020-05-22T19:42:11Z

src/app/dashboard/Missions/MissionEditView.jsx

@@ -380,6 +374,7 @@ const MissionEditView = ({ mission, toDetailsView, toListView, volunteers }) =>
            </Card>
            <Card label="Delivery Details" classes={classes}>
              <Row Icon={ScheduleIcon} classes={classes}>
+                {" "}


If we're trying to add spacing to both sides of this input, can we use CSS instead?

Oops, not sure how that got in there, but it's gone now.

src/app/dashboard/Missions/MissionFundedStatusRow.jsx

jwu910 · 2020-05-22T19:45:57Z

src/app/dashboard/Missions/MissionFundedStatusRow.jsx

+import { Box, Container, Grid, Paper } from "@material-ui/core";
+
+const Row = ({ children, Icon }) => {
+  if (!children) return null;


Row seems to be a general name for this component, but with a pretty specific use case here.

We may not need to even have a separate component for Row because of the nature of the parent it's living in.

In this case, i would just put the JSX from Row inside your return for MissionSFundedStatusRow component.

jwu910 · 2020-05-22T19:47:23Z

src/app/dashboard/Missions/MissionFundedStatusRow.jsx

+      missionFundedStatusText = "Not Yet Funded";
+      break;
+    default:
+      throw Error("mission funded status not exist", mission.fundedStatus);


Is this an error that should be default?

Can a mission not have a FundedStatus?

I don't know, I was trying to reuse code from someone else. I think this was @mat10tng 's?

yes, this is an error. A mission must have a funded status

Are we still fixing this?

jwu910 · 2020-05-22T19:52:57Z

src/app/dashboard/Missions/component/GroupAutoComplete.jsx

+        }
+        renderOption={(group) => (
+          <>
+            <GroupWorkIcon style={{ color: _.randomColor(group.groupDisplayName) }} />{" "}


I don't see random colors in the design for this, is this necessary?

I wish I could answer, this was code I was re-using, originally authored by @mat10tng .

yes, we have random color for group, but this using the same seed, so its mean
hash -> specific color. But it is in the design

Oh okay, I couldn't find random colors on the designs. Might have looked at the wrong frames

jwu910 · 2020-05-22T19:55:47Z

src/app/dashboard/Missions/MissionFundedStatusRow.jsx

+  switch (mission?.fundedStatus) {
+    case Mission.FundedStatus.fundedbydonation:
+      missionFundedStatusText = "Funded By Donation" + fundedDateText;
+      break;
+    case Mission.FundedStatus.fundedbyrecipient:
+      missionFundedStatusText = "Funded By Recipient" + fundedDateText;
+      break;
+    case Mission.FundedStatus.fundingnotneeded:
+      missionFundedStatusText = "Funding Not Needed";
+      break;
+    case Mission.FundedStatus.notfunded:
+      missionFundedStatusText = "Not Yet Funded";
+      break;


Can we use template literals in stead of + for string concatenations?

If fundedDateText isn't provided properly, you're gonna see Funded By Donation12/12/20 or whatever the date text looks like

Funded by donation: ${fundedDateText} probably be a little cleaner.

qdozaq · 2020-05-22T20:26:10Z

src/app/component/UsersAutocomplete.jsx

-          variant="outlined"
-          InputProps={{ ...params.InputProps, type: "search" }}
+    <>
+      {editable ? (


instead of wrapping this whole component in the ternary I think it would be a lot more clear to just put an if statement before hand

if (!editable) { return <H6>... } return <Autocomplete ...

qdozaq · 2020-05-22T20:34:47Z

src/app/dashboard/Missions/MissionEditView.jsx

  );

  const props = { classes, mission };

  const volunteerEditable = volunteerStatus.includes(mission.status);

+  useEffect(() => {
+    document.getElementById("pickup-address-id").value = values.pickUpLocation?.address;
+    document.getElementById("delivery-address-id").value = values.deliveryLocation?.address;


If you're just trying to set the value of the address input I had previously added the value prop which you can use instead

src/app/dashboard/Missions/MissionEditView.jsx

mat10tng · 2020-05-22T21:33:34Z

src/app/dashboard/Missions/MissionEditView.jsx

@@ -368,6 +361,7 @@ const MissionEditView = ({ mission, toDetailsView, toListView, volunteers }) =>
                    <Grid item className={classes.fullWidth}>
                      <AddressInput


change this to AddressAutocomplete. It should be the better version

Do I have to use taht? It doesn't work. For instnace, it doesn't populate the address wiht a default value like "AddressInput" does ...

it should work with defaultLocation props. The adressInput component is unfortunately outdated, with incorrect address and no map. You can check the AdressAutocompelete with default props in action by test order a foodbox

For reference this is how it's being use for checkout https://github.com/factn/resilience-app/blob/master/src/app/page/Request/foodbox/DeliveryStep.jsx#L113

idk if the final design has the map view or but I guess we can worry about that later

The 'final design' is miles behind. Can we pretty pretty please have the map preview turned on? For both address fields?

src/app/dashboard/Missions/MissionEditView.jsx

qdozaq

@jwu910 ?

jwu910 · 2020-05-25T07:23:48Z

src/app/dashboard/Missions/MissionFundedStatusRow.jsx

+  let fundedDateText = mission.fundedDate ? " on " + mission.fundedDate : "";
+  switch (mission?.fundedStatus) {
+    case Mission.FundedStatus.fundedbydonation:
+      missionFundedStatusText = "Funded By Donation ${fundedDateText}";


Incorrect syntax here, these should be in backticks. `` and not quotes.

The linter is catching this warning too

jwu910 · 2020-05-25T07:24:11Z

src/app/dashboard/Missions/MissionFundedStatusRow.jsx

+
+const MissionFundedStatusRow = ({ classes, mission }) => {
+  let missionFundedStatusText;
+  let fundedDateText = mission.fundedDate ? " on " + mission.fundedDate : "";


Unused variable?

jwu910 · 2020-05-25T07:24:27Z

src/app/dashboard/Missions/MissionFundedStatusRow.jsx

+      missionFundedStatusText = "Not Yet Funded";
+      break;
+    default:
+      throw Error("mission funded status not exist", mission.fundedStatus);


Are we still fixing this?

jwu910 · 2020-05-25T07:25:09Z

src/app/dashboard/Missions/component/GroupAutoComplete.jsx

+        }
+        renderOption={(group) => (
+          <>
+            <GroupWorkIcon style={{ color: _.randomColor(group.groupDisplayName) }} />{" "}


Oh okay, I couldn't find random colors on the designs. Might have looked at the wrong frames

src/app/dashboard/Missions/component/GroupAutoComplete.jsx

mat10tng · 2020-05-30T10:10:20Z

move on to another pr #637

Added funded line, ability to edit groups, and fixed what was ailing …

b559980

…volunteer selection.

jwu910 requested changes May 22, 2020

View reviewed changes

qdozaq reviewed May 22, 2020

View reviewed changes

laredotornado added 6 commits May 22, 2020 15:42

Removed spacing.

6b3d896

Removed unnecessary imports.

434ddc7

Using template literals.

c6236f3

Changing how editable fields are being handled.

986dacd

Fixed AddrssInputField default values.

09584cb

removed console.logs

f7004ff

mat10tng reviewed May 22, 2020

View reviewed changes

src/app/dashboard/Missions/MissionEditView.jsx Outdated Show resolved Hide resolved

mat10tng reviewed May 22, 2020

View reviewed changes

src/app/dashboard/Missions/MissionEditView.jsx Outdated Show resolved Hide resolved

mat10tng reviewed May 22, 2020

View reviewed changes

src/app/dashboard/Missions/MissionEditView.jsx Outdated Show resolved Hide resolved

Removed spaces.

6d437cb

qdozaq approved these changes May 23, 2020

View reviewed changes

jwu910 requested changes May 25, 2020

View reviewed changes

This was referenced May 30, 2020

Organizer edit mission details - WIP (needs finishing or replacing) #454

Closed

Feat/edit mission organizer details #637

Draft

mat10tng closed this May 30, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added funded line, ability to edit groups, and fixed what was ailing … #619

Added funded line, ability to edit groups, and fixed what was ailing … #619

laredotornado commented May 22, 2020

jwu910 left a comment

jwu910 May 22, 2020

qdozaq May 22, 2020

laredotornado May 22, 2020

laredotornado May 22, 2020

jwu910 May 22, 2020

laredotornado May 22, 2020

jwu910 May 22, 2020

laredotornado May 22, 2020

jwu910 May 22, 2020

jwu910 May 22, 2020

laredotornado May 22, 2020

mat10tng May 22, 2020 •

edited

Loading

jwu910 May 25, 2020

jwu910 May 22, 2020

laredotornado May 22, 2020

mat10tng May 22, 2020

jwu910 May 25, 2020

jwu910 May 22, 2020

laredotornado May 22, 2020

qdozaq May 22, 2020

laredotornado May 22, 2020

qdozaq May 22, 2020

mat10tng May 22, 2020

laredotornado May 22, 2020

mat10tng May 22, 2020

qdozaq May 22, 2020

utunga May 23, 2020

qdozaq left a comment

jwu910 May 25, 2020

jwu910 May 25, 2020

jwu910 May 25, 2020

jwu910 May 25, 2020

mat10tng commented May 30, 2020

		@@ -368,6 +361,7 @@ const MissionEditView = ({ mission, toDetailsView, toListView, volunteers }) =>
		<Grid item className={classes.fullWidth}>
		<AddressInput

Added funded line, ability to edit groups, and fixed what was ailing … #619

Added funded line, ability to edit groups, and fixed what was ailing … #619

Conversation

laredotornado commented May 22, 2020

jwu910 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mat10tng May 22, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

qdozaq left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mat10tng commented May 30, 2020

mat10tng May 22, 2020 •

edited

Loading