Feat(Setting) donor management module #4837

jeremielodi · 2020-08-20T10:06:13Z

jeremielodi · 2020-08-20T10:40:17Z

There are still others step on which my working in order to totally fix #4826

jmcameron · 2020-08-21T01:00:00Z

I did a functional test with Bhima_test and found that the donor creation/editing works fine. Thanks. I have not scanned the code carefully.

I assume that future Pull Requests will deal with these issues:

Adding more details to the Donor (eg, address, Department, Company, contact info, etc).
Tying this into the Stock Entry module so that you can select an existing Donor or create a new one without leaving the Stock Entry form

jmcameron · 2020-08-24T23:33:47Z

I did another functional test (I did not do a detailed code review). I was able to create, edit, and delete donors. I think that the additional donor contact details will be useful. It will be hard to tell what is really needed for details until we use this in the field with actual donors, etc.

However, I did find one problem: I was able to create a Donor, but when I went to Stock > Stock Entry, and selected "DONOR", I did not see my new donor in the list.

jeremielodi · 2020-08-25T01:41:08Z

The only thing that remains is to create a donation from find modal. I will work on that today and ask for a review just after

mbayopanda

👍 Good job @jeremielodi most part of the work that you made work fine

I have just notice that :

We cannot get the donation receipt from the donation modal
There is not yet a donation module for creating donation
We cannot populate the grid with donation data in the stock entry module

mbayopanda · 2020-08-31T08:25:45Z

client/src/modules/donor/donation.service.js

+/**
+ * Role Service
+ *
+ * A service wrapper for the /donors HTTP endpoint.


This service is for /donors or /donations ? If it is for /donations you could update this line

mbayopanda · 2020-08-31T08:46:36Z

client/src/modules/donor/donor.ctrl.js

+function DonorController($uibModal, Donor, Modal, Notify, uiGridConstants) {
+  const vm = this;
+
+  vm.createUpdateDonorModal = (selectedRole = {}) => {


I think this parameter is not related to role may be selectedDonor is a better name

mbayopanda · 2020-08-31T08:47:40Z

client/src/modules/donor/donor.ctrl.js

+
+    Donor.read()
+      .then(roles => {
+        vm.gridOptions.data = roles;


donors in place of roles will be better

mbayopanda · 2020-08-31T08:52:38Z

client/src/modules/donor/modal/createUpdate.js

@@ -0,0 +1,36 @@
+angular.module('bhima.controllers')
+  .controller('DonorAddController', DonorAddController);


It seems like the controller is not only for creation of donors, so you could rename this controller to something like : DonorCreateAndUpdateController, DonorManagementController, etc.

mbayopanda · 2020-08-31T08:55:51Z

client/src/modules/stock/entry/entry.js

-      TODO: add a donor management module
-    */
-    movement.lots = Stock.processLotsFromStore(vm.stockForm.store.data, Uuid());
+    movement.lots = Stock.processLotsFromStore(vm.stockForm.store.data, vm.movement.entity.uuid);


mbayopanda · 2020-08-31T08:57:28Z

client/src/modules/stock/entry/modals/findDonation.modal.html

+    <div class="row">
+      <div class="col-xs-12">
+        <div
+          id="PurchaseGrid"


The grid is not for purchase I think, maybe DonationGrid will be better

mbayopanda · 2020-08-31T09:02:50Z

client/src/modules/stock/entry/modals/findDonation.modal.js

+      field            : 'reference',
+      displayName      : 'TABLE.COLUMNS.REFERENCE',
+      headerCellFilter : 'translate',
+      cellTemplate     : 'modules/stock/entry/modals/templates/purchase_reference.tmpl.html',


It seems like this template is used also with purchase, do you think we can rename it ?

mbayopanda · 2020-08-31T09:09:28Z

client/src/modules/stock/entry/modals/findDonation.modal.js

+    vm.gridApi.core.notifyDataChange(uiGridConstants.dataChange.COLUMN);
+  }
+
+  /** get purchase document */


Is it possible to add comments about the use of Receipts.purchase here.

Also I cannot get the receipt of donation

mbayopanda · 2020-08-31T09:11:55Z

server/config/routes.js

+  app.get('/donations/:uuid', donation.detail);
+  app.put('/donations/:uuid', donation.update);
+  app.delete('/donations/:uuid', donation.remove);
+


mbayopanda · 2020-08-31T09:28:17Z

client/src/modules/donor/modal/createUpdate.html

+  </div>
+
+  <div class="modal-body">
+    <div class="row">


Could you remove this <div class="row"> it is not necessary

jmcameron

I did another test and the donor add/edit/delete works fine.
However, using the Donors in the Stock Entry page is confusing to me.

When I added a new donor, and did Stock > Stock Entry, clicked on [Donor], the new Donor is not listed.
In the pop-up dialog that comes up to select a donor, if I click the check mark for the existing Donor and click on [Submit], I return to the Stock Entry page, but no Donor is indicated in the [Donor] button AND there is still a warning at the bottom "No source selected".
In the pop-up donor selection dialog, there is an [+] button on the top right to add a Donor (right?). However, I think there is a problem with the controls:

Notice that controls to add stock items appears. That should not be in this form. This form should just select the donor and return the the main Stock Entry page with the Donor inserted. If you click on the [Add] button, to add stock items (which you should not do in this form), you will see error messages on the underlying screen, not this dialog! So I think that the lower part (to add stock items) should be removed from this form.
Finally, is the pop-up Donor selection dialog the only place to associated a donation with a project?

What would make more sense to me (and probably be simpler for users), would be for

The Donor selection dialog allows you to pick the donor and return to the main Stock entry form.
The Donor would be selected and displayed in the [Donor] button.
Two new fields would appear in the Stock Entry form:
- a task selection field (drop-down menu)
- a donation description text field
No additional donation date field is needed (probably); I think that the date of the entry should be adequate. One could enter any other original donation dates, etc, in the Donation description field.

jeremielodi · 2020-09-03T19:29:47Z

The field date is enough for specifying the donation date, the stock_movement table has another column created_at that tell us the date the stock has been encoded

jeremielodi · 2020-09-03T19:37:08Z

The donor list shows up without error

jmcameron · 2020-09-03T19:42:02Z

The donor list shows up without error

Yes, I saw that. And it worked for me, but I thought the process was difficult. I outlined the way that seemed more user-friendly to me in my previous post.

jeremielodi · 2020-09-03T19:47:45Z

Even for purshase order if you create a supplier no source will be selected in the stock entry, @mbayopanda can tell us more about this

mbayopanda · 2020-09-07T08:26:23Z

Even for purshase order if you create a supplier no source will be selected in the stock entry, @mbayopanda can tell us more about this

I agree that we can simplify this feature by having just the donor (when we click on the donation button), we have already these pieces of information (date, description, and inventories) in the stock entry form, and I am not sure if we really need the project here.

jniles · 2020-09-28T17:10:15Z

@jeremielodi what is the status of this PR?

closes Third-Culture-Software#4826

Cherry picked the bh-date-editor changes from Third-Culture-Software#4837 to bring them into master sooner. Closes Third-Culture-Software#4919.

Cherry picked the bh-date-editor changes from Third-Culture-Software#4837 and add the critical await call to prevent test failures. Closes Third-Culture-Software#4919.

4970: fix(test): fix bh-date-editor tests r=lomamech a=jniles Cherry picked the bh-date-editor changes from #4837 to bring them into `master` sooner. Closes #4919. Co-authored-by: Jonathan Niles <jonathanwniles@gmail.com>

kwilu added needs review size: XL labels Aug 20, 2020

jeremielodi force-pushed the donator branch 5 times, most recently from 061e031 to 2f29aca Compare August 24, 2020 14:27

mbayopanda reviewed Aug 31, 2020

View reviewed changes

jeremielodi force-pushed the donator branch 2 times, most recently from 01c9da8 to 11d5c8f Compare September 3, 2020 10:51

jmcameron self-requested a review September 3, 2020 17:54

jmcameron approved these changes Sep 3, 2020

View reviewed changes

jeremielodi force-pushed the donator branch from 0354c7d to 2784906 Compare September 9, 2020 11:11

jeremielodi mentioned this pull request Sep 9, 2020

Test(Component Date Editor) #4890

Merged

jeremielodi force-pushed the donator branch 7 times, most recently from b8b92b1 to e9747ca Compare September 11, 2020 08:21

jeremielodi force-pushed the donator branch 3 times, most recently from 5137ff6 to 8eac0b7 Compare September 25, 2020 11:05

jeremielodi added 8 commits September 29, 2020 09:43

Feat(Setting) donor management module

e57e5b6

closes Third-Culture-Software#4826

e2e test for donor management

eb49ae4

(stock entry) find donation modal

54abcc2

add donation items

2e5a533

fill stock entry grid

e9ae3cb

remove project_id

6a6f163

fix bh-date-editor test bug

cfd838d

start end-to-end test

65f4898

jeremielodi force-pushed the donator branch from 8eac0b7 to 74c15be Compare September 29, 2020 08:45

new donation test-end

9a07f52

jeremielodi force-pushed the donator branch from 74c15be to 9a07f52 Compare September 29, 2020 11:59

jniles added a commit to jniles/bhima that referenced this pull request Sep 30, 2020

fix(test): fix bh-date-editor tests

036657c

Cherry picked the bh-date-editor changes from Third-Culture-Software#4837 to bring them into master sooner. Closes Third-Culture-Software#4919.

jniles mentioned this pull request Sep 30, 2020

fix(test): fix bh-date-editor tests #4970

Merged

jniles added a commit to jniles/bhima that referenced this pull request Sep 30, 2020

fix(test): fix bh-date-editor tests

443c2fd

Cherry picked the bh-date-editor changes from Third-Culture-Software#4837 to bring them into master sooner. Closes Third-Culture-Software#4919.

jniles added a commit to jniles/bhima that referenced this pull request Sep 30, 2020

fix(test): fix bh-date-editor tests

c8dad2b

Cherry picked the bh-date-editor changes from Third-Culture-Software#4837 to bring them into master sooner. Closes Third-Culture-Software#4919.

jniles added a commit to jniles/bhima that referenced this pull request Sep 30, 2020

fix(test): fix bh-date-editor tests

57e14f6

Cherry picked the bh-date-editor changes from Third-Culture-Software#4837 to bring them into master sooner. Closes Third-Culture-Software#4919.

jeremielodi closed this Oct 1, 2021

jeremielodi deleted the donator branch October 1, 2021 09:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat(Setting) donor management module #4837

Feat(Setting) donor management module #4837

jeremielodi commented Aug 20, 2020 •

edited by jniles

Loading

jeremielodi commented Aug 20, 2020 •

edited

Loading

jmcameron commented Aug 21, 2020

jmcameron commented Aug 24, 2020

jeremielodi commented Aug 25, 2020

mbayopanda left a comment

mbayopanda Aug 31, 2020

mbayopanda Aug 31, 2020

mbayopanda Aug 31, 2020

mbayopanda Aug 31, 2020

mbayopanda Aug 31, 2020

mbayopanda Aug 31, 2020

mbayopanda Aug 31, 2020

mbayopanda Aug 31, 2020

mbayopanda Aug 31, 2020

mbayopanda Aug 31, 2020

jmcameron left a comment

jeremielodi commented Sep 3, 2020 •

edited

Loading

jeremielodi commented Sep 3, 2020 •

edited

Loading

jmcameron commented Sep 3, 2020 •

edited by jniles

Loading

jeremielodi commented Sep 3, 2020

mbayopanda commented Sep 7, 2020

jniles commented Sep 28, 2020

		@@ -0,0 +1,36 @@
		angular.module('bhima.controllers')
		.controller('DonorAddController', DonorAddController);

Feat(Setting) donor management module #4837

Feat(Setting) donor management module #4837

Conversation

jeremielodi commented Aug 20, 2020 • edited by jniles Loading

jeremielodi commented Aug 20, 2020 • edited Loading

jmcameron commented Aug 21, 2020

jmcameron commented Aug 24, 2020

jeremielodi commented Aug 25, 2020

mbayopanda 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

jmcameron left a comment

Choose a reason for hiding this comment

jeremielodi commented Sep 3, 2020 • edited Loading

jeremielodi commented Sep 3, 2020 • edited Loading

jmcameron commented Sep 3, 2020 • edited by jniles Loading

jeremielodi commented Sep 3, 2020

mbayopanda commented Sep 7, 2020

jniles commented Sep 28, 2020

jeremielodi commented Aug 20, 2020 •

edited by jniles

Loading

jeremielodi commented Aug 20, 2020 •

edited

Loading

jeremielodi commented Sep 3, 2020 •

edited

Loading

jeremielodi commented Sep 3, 2020 •

edited

Loading

jmcameron commented Sep 3, 2020 •

edited by jniles

Loading