non site based reporting

[drfaustusfade]

to check if we can have a location without site_id and site_name

[drfaustusfade]

to check if validation can be set per country

[drfaustusfade]

to check if titles without site_name will be displayed correctly

[fakhrihawari]

to check if titles without site_name will be displayed correctly

Just Like this?

[fakhrihawari]

to check if validation can be set per country

I think we can do that

[fakhrihawari]

to check if we can have a location without site_id and site_name

to check if we can have a location without site_id and site_name

In model site_name is required

[drfaustusfade]

alright, let's try there were already such questions and requests for ET and NG for non-site reporting and optional site name, I think we can have that feature
please try to implement it

[fakhrihawari]

Mock up

sitenameno.mp4

[drfaustusfade]

Looks alright, what do you think also if visually having some kind of greyed out input, but on hover input would be active

could you also please push commit, with not mandatory site name input for ET to have a test run

[drfaustusfade]

For engine and frontend, please confirm also that having site name as non mandatory would not break anything

[fakhrihawari]

but i'm not done NG coz NG have different form

[drfaustusfade]

Alright, we will try to migrate them later, when infinite scroll is done

[fakhrihawari]

ok

[fakhrihawari]

Testing for ET
https://github.com/fakhrihawari/ngm-reportHub/tree/non-site_id-site_name
https://github.com/fakhrihawari/ngm-reportEngine/tree/non-site_id-site_name-be

Updated non site based old from too for NG

[drfaustusfade]

looks good,
rename: No need to fill this => "-"
Site Name? => Site
SiteName => Site?
is required site_name should be removed on other collections in addition to TargetLocation? will that cause issues?

Note: as for now NG opted to still have required

let's have that feature for future use, but we will use just not mandatory site_name input for now so that not to confuse partners

• to check not required site_name input for ET without a checkbox

[fakhrihawari]

So for NG no need to change ?

[drfaustusfade]

no need for now, but they can decide later to have that feature

[fakhrihawari]

without checkbox
https://user-images.githubusercontent.com/12655589/108685233-7b228900-7526-11eb-89b9-54b45c24add4.mp4

If location do not have site_name it not appear in monthly report

[drfaustusfade]

what is the reason?

[fakhrihawari]

what is the reason?

i dont know

[drfaustusfade]

alright, let's check, what are branches?

[fakhrihawari]

https://github.com/fakhrihawari/ngm-reportHub/tree/non-site_id-site_name
https://github.com/fakhrihawari/ngm-reportEngine/tree/non-site_id-site_name-be

that one

[fakhrihawari]

I found the problem, the site_name is set to undefined if its blank , i will fix it

[fakhrihawari]

Updated with test to check not required site_name input for ET without a checkbox and bug fix monthly report location without sitename

[drfaustusfade]

alright, would setting site_name defaultsTo "" fix also the problem? let's set it like that to safeguard. Also other collection required site_name would inherit from target_locations?

[drfaustusfade]

NG still have SiteName selection

[fakhrihawari]

alright, would setting site_name defaultsTo "" fix also the problem? let's set it like that to safeguard. Also other collection required site_name would inherit from target_locations?

yes, i change the model for beneficairies and location for report like target location coz it will not appear in monthly report

okay updated and remove hide sitename selection from NG

[drfaustusfade]

alright, some issues
that on adding location for ET, the site name is required
and if removing the site name from target location, the site name will still be with old name

[fakhrihawari]

alright, some issues
that on adding location for ET, the site name is required
and if removing the site name from target location, the site name will still be with old name

actually i already fix this before, i comment the code that solve for that issue coz i think site_name defaultsTo "" will also fix that too and not to checki it again . But now it fix

fixbuget.mp4

[drfaustusfade]

ok, perfect, adding monthly report locations also updated?

alright, some issues
that on adding location for ET, the site name is required
and if removing the site name from target location, the site name will still be with old name

actually i already fix this before, i comment the code that solve for that issue coz i think site_name defaultsTo "" will also fix that too and not to checki it again . But now it fix

fixbuget.mp4

[fakhrihawari]

ok, perfect, adding monthly report locations also updated?

alright, some issues
that on adding location for ET, the site name is required
and if removing the site name from target location, the site name will still be with old name

actually i already fix this before, i comment the code that solve for that issue coz i think site_name defaultsTo "" will also fix that too and not to checki it again . But now it fix
fixbuget.mp4

updated for add location on monthly report location. do we keep this "site_name_checked" atrribute?

[drfaustusfade]

i would propose to have it for the future us, in case we will need checkbox

[drfaustusfade]

// on monthly add location validate, I think !l.site_name is missing, otherwise errors everywhere except ET
if (l.admin0pcode !== 'ET') {
					id = "label[for='ngm-new_location-site_name']";
					$(id).addClass('error');
					validation.divs.push(id);
					complete = false;
				}

[fakhrihawari]

// on monthly add location validate, I think !l.site_name is missing, otherwise errors everywhere except ET
if (l.admin0pcode !== 'ET') {
					id = "label[for='ngm-new_location-site_name']";
					$(id).addClass('error');
					validation.divs.push(id);
					complete = false;
				}

Thank you , updated

[drfaustusfade]

if (d.admin0pcode === 'NG') {
								rowComplete++;
							}else{
								if (d.site_name) {
									rowComplete++;
								}
							}

NG have confirmed not required site_name yet, in that case, I think site_name should be checked

[drfaustusfade]

Location names on monthly reports without site name end as next
, null
,
I think it is better visually not to have them

[fakhrihawari]

if (d.admin0pcode === 'NG') {
								rowComplete++;
							}else{
								if (d.site_name) {
									rowComplete++;
								}
							}

NG have confirmed not required site_name yet, in that case, I think site_name should be checked

i already updated that too , for now that site_name not be checked only for ET

[fakhrihawari]

Location names on monthly reports without site name end as next
, null
,
I think it is better visually not to have them

Updated, should we push?

[drfaustusfade]

looks alright, please recheck all functionality again where site_name is concerned and proceed with a pull request

[fakhrihawari]

okay

[drfaustusfade]

Notes:
markers look ok without site_name, i think no need to update

[fakhrihawari]

on PR

[drfaustusfade]

thank you, well done,
I was also thinking on forms, to have input next to checkbox like when site selection present with disabled input, or in place of checkbox to use selection from list, adding option to yes/no/ non-site

[fakhrihawari]

link branch updated
https://github.com/fakhrihawari/ngm-reportHub/tree/non-site_id-site_name

is like that?

[drfaustusfade]

yes, could be, i think that is cleaner than the checkbox, by the cost of one more click, what do you think?

other design option, as you did, would be in place of Site ? and From List ? selections to have checkboxes with same site name input on the same line rather than separate, but that would be hard to put in balance to other elements

Note:
to change Site Name ? to label just Site ?

[fakhrihawari]

Yes, it more aligned using select rather than checkbox

[fakhrihawari]

[drfaustusfade]

alright, lets have ? mark without space

[drfaustusfade]

NG confirmed not mandatory site name, please enable, but without site? selection

[fakhrihawari]

alright, lets have ? mark without space

updated

[fakhrihawari]

Link PR:
drfaustusfade/ngm-reportHub#113

[drfaustusfade]

alright, there seem to be some bugs, please test and compile test cases conducted
also please split NG enabling non-mandatory input, in a separate commit
location form yes/no site selection into a separate commit
and for now not enable site yes/no selection for ET,

I had
on adding location

on changing site yes/no

also for some reason next

after save

[fakhrihawari]

Miss that one , i will try solve this and push it as soon as posible,
and "now not enable site yes/no selection for ET" i think on master already like that

[fakhrihawari]

Fix it like this

conduct_test.mp4

and sometime the site name not appear coz the type of site_id in location and in the list not same
like below

is just on my local all in prod too?

link : https://github.com/fakhrihawari/ngm-reportHub/tree/non-site_id-site_name

if you okay, i will make separate commit for NG

[fakhrihawari]

NOTE:
Some admin2,admin3 code in AdminSite is different from list Admin2List and admin3list
in admin2list

in adminSIteList

So if we select site_name from list it become like this

[fakhrihawari]

Link Hide Feature "Site?":
https://github.com/fakhrihawari/ngm-reportHub/tree/non-site_id-site_name