Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Member Count Error in Member Dashboard #1925

Merged
merged 8 commits into from
Mar 11, 2017
Merged

Member Count Error in Member Dashboard #1925

merged 8 commits into from
Mar 11, 2017

Conversation

simonkp
Copy link

@simonkp simonkp commented Feb 14, 2017

fix #1924

  • Apply left join onn family wher join with person to get the members
    without family accounted.
  • Also added Links to Family Roles section on membersdashboard.

fix #1924
* Apply left join onn family wher join with person to get the members
without family accounted.
* Also added Links to Family Roles section on membersdashboard.
@@ -27,7 +27,7 @@
$rsAdultsGender = RunQuery($sSQL);

$sSQL = 'select count(*) as numb, per_Gender from person_per , family_fam
where fam_ID =per_fam_ID and fam_DateDeactivated is null and per_Gender in (1,2) and per_fmr_ID not in (1,2) group by per_Gender ;';
where fam_ID =per_fam_ID and fam_DateDeactivated is null and per_Gender in (1,2) and per_fmr_ID in (3) group by per_Gender ;';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these should be the sDirRoleChild

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for adults, used not in sDirRoleChild

Copy link
Contributor

@DawoudIO DawoudIO left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lust us use the correct role ids from

"sDirRoleHead","sDirRoleSpouse","sDirRoleChild"

using SystemConfig::getValue('sDirRoleChild')
@simonkp
Copy link
Author

simonkp commented Feb 14, 2017

It is not just for kids, for adults as well.
It is under the heading Gender Demographics. So i think it is ok to omit those with gender not set.

The Family Roles section will show this anyway.

2017-02-15 01_01_51-churchcrm_ members dashboard

@DawoudIO
Copy link
Contributor

yep that would work.

@DawoudIO DawoudIO added this to the 2.7.0 milestone Feb 17, 2017
@DawoudIO DawoudIO added the bug label Feb 17, 2017
@crossan007
Copy link
Contributor

crossan007 commented Feb 18, 2017

This would be a good opportunity to move the dashboard service to ORM code.

I haven't yet fully thought out the transition, but let's begin.

If possible - we should create REST endpoints that are not "dashboard specific," but rather enhance our family / person endpoints so that the Dashboard can be completely client-side code querying the well-defined object endpoints.

I'm also open to implementing this fix, and tracking ORM migration in a separate PR / ticket.

@DawoudIO
Copy link
Contributor

Let's us do the fix and track orm else where

@DawoudIO
Copy link
Contributor

looks like this also could be fixing #1155

@simonkp
Copy link
Author

simonkp commented Feb 28, 2017

I think this is good to go? any other comments?

@DawoudIO DawoudIO modified the milestones: 2.7.0, 2.6.1 Mar 1, 2017
@DawoudIO
Copy link
Contributor

DawoudIO commented Mar 1, 2017

@rakess70 can you test this and let me know if it fixes your issue, if so I'll make it part of the 2.6.1 build

@rakess70
Copy link

rakess70 commented Mar 4, 2017

@DawoudIO I am not sure which issue you are referring to?

@DawoudIO
Copy link
Contributor

DawoudIO commented Mar 5, 2017

@rakess70 sorry i thought you created the issue but it was @saulowulhynek

@DawoudIO
Copy link
Contributor

DawoudIO commented Mar 5, 2017

@simonkp can you apply https://styleci.io/analyses/8wvPK4 patch

@DawoudIO DawoudIO assigned saulowulhynek and unassigned rakess70 Mar 5, 2017
@DawoudIO DawoudIO changed the title Fix 1924 membercounterror Member Count Error in Member Dashboard Mar 11, 2017
@DawoudIO DawoudIO merged commit cbafb7d into ChurchCRM:master Mar 11, 2017
DawoudIO pushed a commit that referenced this pull request Mar 12, 2017
* Updated Default Values

* added select2

* using memeber default & select 2 for country

using memeber default city/state & select 2

* Apply fixes from StyleCI (#1995)

* Add Behat testing (#2010)

* underp master vs develop merge

* underps

* start 2.6.1 (#2034)

* start 2.6.1

* underp 2.6.1 upgrade.

* don't include unreleased features in the changelog

* 2.6.1 rev jquery photo uploader (#2035)

* start 2.6.1

* underp 2.6.1 upgrade.

* rev photo uploader to 1.0.10

* release window documentation (#2055)

* release window doc

* release window doc

* cherry-pick #2061 for Master 2.6.1

* Update Config.php.example

* fix broken search

* rev photo uploader to 1.0.11 (#2071)

* Member Count Error in Member Dashboard (#1925)

* fix membercount error

fix #1924
* Apply left join onn family wher join with person to get the members
without family accounted.
* Also added Links to Family Roles section on membersdashboard.

* Changes to use SystemConfig

using SystemConfig::getValue('sDirRoleChild')

* PersonView, FamilyView ui changes #1863 (#2026)

* PersonView, FamilyView ui changes #1863

closes #1863
changed overlay, added view photo button. added modal for displaying
larger photo, displaying view photo button, using code from Initials.js
if photo exists.

* addressing review comments

* upgrade
@simonkp simonkp deleted the fix-#1924-membercounterror branch March 17, 2017 15:31
DawoudIO pushed a commit that referenced this pull request Apr 1, 2017
* Updated Default Values

* added select2

* using memeber default & select 2 for country

using memeber default city/state & select 2

* Apply fixes from StyleCI (#1995)

* Add Behat testing (#2010)

* underp master vs develop merge

* underps

* start 2.6.1 (#2034)

* start 2.6.1

* underp 2.6.1 upgrade.

* don't include unreleased features in the changelog

* 2.6.1 rev jquery photo uploader (#2035)

* start 2.6.1

* underp 2.6.1 upgrade.

* rev photo uploader to 1.0.10

* release window documentation (#2055)

* release window doc

* release window doc

* cherry-pick #2061 for Master 2.6.1

* Update Config.php.example

* fix broken search

* rev photo uploader to 1.0.11 (#2071)

* Member Count Error in Member Dashboard (#1925)

* fix membercount error

fix #1924
* Apply left join onn family wher join with person to get the members
without family accounted.
* Also added Links to Family Roles section on membersdashboard.

* Changes to use SystemConfig

using SystemConfig::getValue('sDirRoleChild')

* PersonView, FamilyView ui changes #1863 (#2026)

* PersonView, FamilyView ui changes #1863

closes #1863
changed overlay, added view photo button. added modal for displaying
larger photo, displaying view photo button, using code from Initials.js
if photo exists.

* addressing review comments

* UI Cleanup/bugs

closes #2084 #2112

* UI Improvments

closes #2112

* Apply fixes from StyleCI (#2113)

* Fix database backup (#2118)

* closes #2099

* Apply fixes from StyleCI

* using github-release-notes in the bash script
renamed the npm target
updated changeslog.md

* updated steps and included changelog task

* Cash is displayed even if 0 #1852 (#1983)

* resolves #1852

* still show 0 cash if 0 cash 💯

* applied styleci patch

* Remove old changelog

* start 2.6.2 (#2125)

* this works on ASO demo site. (#2126)

* #2121-unable to create event (#2122)

add document ready function around the dateranger script.

fixes #2121

* start 2.6.3 (#2127)

* 2.6.3

* update changelog

* Update CHANGELOG.md

removed dbl logs

* Feature/2124 notification bar (#2167)

* Working POC

* Fix styles

* get data from web service

* Apply fixes from StyleCI

* allow for differentating admin vs all user notifications

* add TTL setting for notifications

* don't include system notifications locally

* cleanup

* underp boolean call

* address comments - handle exceptions correctly

* fix logic if captive portal intercepts notification request

* cleanup spaces

* make code work again.
DawoudIO pushed a commit that referenced this pull request Apr 8, 2017
* Updated Default Values

* added select2

* using memeber default & select 2 for country

using memeber default city/state & select 2

* Apply fixes from StyleCI (#1995)

* Add Behat testing (#2010)

* underp master vs develop merge

* underps

* start 2.6.1 (#2034)

* start 2.6.1

* underp 2.6.1 upgrade.

* don't include unreleased features in the changelog

* 2.6.1 rev jquery photo uploader (#2035)

* start 2.6.1

* underp 2.6.1 upgrade.

* rev photo uploader to 1.0.10

* release window documentation (#2055)

* release window doc

* release window doc

* cherry-pick #2061 for Master 2.6.1

* Update Config.php.example

* fix broken search

* rev photo uploader to 1.0.11 (#2071)

* Member Count Error in Member Dashboard (#1925)

* fix membercount error

fix #1924
* Apply left join onn family wher join with person to get the members
without family accounted.
* Also added Links to Family Roles section on membersdashboard.

* Changes to use SystemConfig

using SystemConfig::getValue('sDirRoleChild')

* PersonView, FamilyView ui changes #1863 (#2026)

* PersonView, FamilyView ui changes #1863

closes #1863
changed overlay, added view photo button. added modal for displaying
larger photo, displaying view photo button, using code from Initials.js
if photo exists.

* addressing review comments

* UI Cleanup/bugs

closes #2084 #2112

* UI Improvments

closes #2112

* Apply fixes from StyleCI (#2113)

* Fix database backup (#2118)

* closes #2099

* Apply fixes from StyleCI

* using github-release-notes in the bash script
renamed the npm target
updated changeslog.md

* updated steps and included changelog task

* Cash is displayed even if 0 #1852 (#1983)

* resolves #1852

* still show 0 cash if 0 cash 💯

* applied styleci patch

* Remove old changelog

* start 2.6.2 (#2125)

* this works on ASO demo site. (#2126)

* #2121-unable to create event (#2122)

add document ready function around the dateranger script.

fixes #2121

* start 2.6.3 (#2127)

* 2.6.3

* update changelog

* Update CHANGELOG.md

removed dbl logs

* Feature/2124 notification bar (#2167)

* Working POC

* Fix styles

* get data from web service

* Apply fixes from StyleCI

* allow for differentating admin vs all user notifications

* add TTL setting for notifications

* don't include system notifications locally

* cleanup

* underp boolean call

* address comments - handle exceptions correctly

* fix logic if captive portal intercepts notification request

* rev jQuery-photo-uploader (#2185)

* closes #2123 (#2184)

* update changelog (#2190)

* update changelog

* 2.6.3

* locked to 0.6.3

* locked to 0.6.3

* Update CHANGELOG.md

trim down to subset of changes

* Add Behat tests to TravisCI (#2011)

* underp master vs develop merge

* underps

* add test to travis

* add apache to travis.

* tweaks

* change path

* move to script. troubleshooting.

* debugging

* debugging

* fix path

* fix path

* tweaks

* tweaks

* underp

* tweaks

* tweaks

* tweaks

* tweaks

* tweaks

* tweaks

* tweaks

* tweaks

* tweaks

* tweaks

* tweaks

* move fpm conf

* tweak

* tweak

* tweak

* tweak

* fingers crossed.

* fingers crossed.

* fingers crossed.

* debug

* tweak paths

* tweak config

* tweak config

* permissions

* permissions

* tweaks

* tweaks

* tweaks

* tweaks

* tweaks

* tweaks

* tweaks

* add config

* tweaks

* tweaks

* revert login changes

* change index

* cleanup

* underp php fpm

* underp

* rewrite?

* rewrite?

* SetHandler

* use sockets

* derppp

* derppp

* derppp sockets

* derppp sockets

* derppp sockets

* proxy?

* test?

* tweaks? try again?

* Important! Read the above again https://wiki.apache.org/httpd/PHP-FPM

* tweak multi view

* cleanup

* Update Config.php

* Update README.md (#2247)

* added ignore question
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

BUG - 2.6.0-RC1: Member Count Error in Member Dashboard
5 participants