#1872 update pages for deactivated families #2046

simonkp · 2017-03-04T07:11:55Z

Update to dashboard page fixes Update pages to remove deactivated families #1872

Addded functions to DashboardService to fetch the updated and latest
families and members.
Converted queries to ORM and filtered out deactivated families.

Add deactivated filter to Family view and person view pages. fixes Update pages to remove deactivated families #1872

Added filters to fetch only active families /members from active
families only to the following pages.
-- FamilyList.php, SelectList.php

Deactivated (Inactive) families listing - fixes Deactivated (Inactive) families listing #1873

Deactivated (Inactive) families listing Deactivated (Inactive) families listing #1873
modified the FamilyView.php to handle inactive families listing by
passing ?mode=inactive

* Addded functions to DashboardService to fetch the updated and latest families and members. * Converted queries to ORM and filtered out deactivated families. fixes # 1872

* added filters to fetch only active families /members from active families only to the following pages. -- FamilyList.php, SelectList.php fixes #1872

Deactivated (Inactive) families listing #1873 * modified the FamilyView.php to handle inactive families listing by passing ?mode=inactive fixes #1873

DawoudIO

I'll do some testing tonight but this is the code changes needed

DawoudIO · 2017-03-05T18:04:07Z

src/ChurchCRM/Service/DashboardService.php

+    /**
+     * //Return last edited families. only active families selected
+     * @param int $limit
+     * @return array|\ChurchCRM\Family[]|mixed|\Propel\Runtime\ActiveRecord\ActiveRecordInterface[]|\Propel\Runtime\Collection\ObjectCollection


DawoudIO · 2017-03-05T18:05:03Z

src/ChurchCRM/Service/DashboardService.php

+     */
+    public function getUpdatedFamilies($limit = 12)
+    {
+        return FamilyQuery::create()


i think now that we have ORM, these can be moved inline as we are trying to kill the old style services if we can

I think We should move towards keeping the model and view separately. logic should be in the model classes. Should I move this to Family (Model/ChurchCRM/Family.php?

@crossan007 what say you... i agree with both ways...

DawoudIO · 2017-03-05T18:11:09Z

src/ChurchCRM/Service/FamilyService.php

+     */
+    public function getActiveFamilies()
+    {
+        return FamilyQuery::create()


same here simple ORM that is only used once should be now inline

DawoudIO · 2017-03-05T18:11:43Z

src/FamilyList.php

+if (strtolower($sMode) == 'Inactive'){
+    $families = $familyService->getDeactivatedFamilies();
+} else {
+    $sMode = 'Active';


why is this needed

This will resolve the #1873 (Deactivated (Inactive) families listing) without creating a separate page. If inactive is passed, it will get getDeactivatedFamilies.

DawoudIO · 2017-03-05T18:12:01Z

src/FamilyList.php

-$sPageTitle = gettext('Family List');
-require 'Include/Header.php';
+// Filter received user input as needed
+if (isset($_GET['mode'])) {


the better way to do this is to set the default mode
then do a single if

DawoudIO · 2017-03-05T18:12:22Z

src/FamilyList.php

-      <tbody>
-      <?php
+    <div class="box-body">
+        <table id="families" class="table table-striped table-bordered data-table" cellspacing="0" width="100%">


move to datatable

it is already a data table. class data-table is included.

DawoudIO · 2017-03-05T18:12:39Z

src/Menu.php

 $dashboardService = new DashboardService();
 $personCount = $dashboardService->getPersonCount();
 $familyCount = $dashboardService->getFamilyCount();
 $groupStats = $dashboardService->getGroupStats();
+//Last edited active families
+$updatedFamilies = $dashboardService->getUpdatedFamilies(10);


please move inline

DawoudIO · 2017-03-05T18:13:09Z

src/Menu.php

+                                    <a href="FamilyView.php?FamilyID=<?= $family->getId() ?>"><?= $family->getName() ?></a>
+                                </td>
+                                <td><?= $family->getAddress() ?></td>
+                                <td><?=  date_format($family->getDateEntered(),SystemConfig::getValue('sDateFormatLong')) ?></td>


DawoudIO · 2017-03-05T23:21:35Z

src/mysql/upgrade/2.7.0-menu-inactive-families.sql

@@ -0,0 +1,6 @@
+UPDATE `menuconfig_mcf` SET content_english = 'View Active Families', `content` = 'View Active Families' WHERE `mid` = 15;
+
+DELETE FROM `menuconfig_mcf` where `mid` = 16 ;


why are you del 16? then creating a new one... what was #16 before

16 is a new one, there was no 16 before. i thought if this script get a second run somehow, it should delete and reinsert. not required?

Review comment fixes

DawoudIO · 2017-03-08T15:56:48Z

@rakess70 does this address your Question about deactivated families

DawoudIO · 2017-03-08T15:57:32Z

please apply https://styleci.io/analyses/q53Vpx

Style CI fixes

simonkp added 3 commits March 4, 2017 14:18

Update to dashboard page

0c173f4

* Addded functions to DashboardService to fetch the updated and latest families and members. * Converted queries to ORM and filtered out deactivated families. fixes # 1872

Add deactivated filter to Family view and person view pages.

21092a6

* added filters to fetch only active families /members from active families only to the following pages. -- FamilyList.php, SelectList.php fixes #1872

Deactivated (Inactive) families listing

21368c6

Deactivated (Inactive) families listing #1873 * modified the FamilyView.php to handle inactive families listing by passing ?mode=inactive fixes #1873

DawoudIO added the In Review label Mar 4, 2017

simonkp mentioned this pull request Mar 4, 2017

Update pages to remove deactivated families #1872 #1877

Closed

Merge branch 'develop' into #1872-update-pages-for-deactivated-families

21855f5

DawoudIO added this to the 2.7.0 milestone Mar 5, 2017

DawoudIO requested review from DawoudIO and crossan007 March 5, 2017 23:19

DawoudIO requested changes Mar 5, 2017

View reviewed changes

simonkp and others added 3 commits March 7, 2017 02:14

Review comment fixes

39e6e25

Review comment fixes

Merge branch 'develop' into #1872-update-pages-for-deactivated-families

230cdde

Merge branch 'develop' into #1872-update-pages-for-deactivated-families

45d8866

DawoudIO assigned rakess70 Mar 8, 2017

simonkp and others added 5 commits March 9, 2017 09:33

Style CI fixes

cb11d1a

Style CI fixes

More StyleCI fixes

861525f

Merge branch 'develop' into #1872-update-pages-for-deactivated-families

744cd03

Merge branch 'develop' into #1872-update-pages-for-deactivated-families

85bf110

Merge branch 'develop' into #1872-update-pages-for-deactivated-families

ba71e44

DawoudIO approved these changes Mar 13, 2017

View reviewed changes

DawoudIO added bug enhancement development labels Mar 13, 2017

DawoudIO merged commit 276c966 into ChurchCRM:develop Mar 13, 2017

DawoudIO removed the In Review label Mar 13, 2017

simonkp deleted the #1872-update-pages-for-deactivated-families branch March 17, 2017 15:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#1872 update pages for deactivated families #2046

#1872 update pages for deactivated families #2046

simonkp commented Mar 4, 2017 •

edited

Loading

DawoudIO left a comment

DawoudIO Mar 5, 2017

DawoudIO Mar 5, 2017

simonkp Mar 6, 2017

DawoudIO Mar 8, 2017

DawoudIO Mar 5, 2017

DawoudIO Mar 5, 2017

simonkp Mar 6, 2017

DawoudIO Mar 5, 2017

simonkp Mar 6, 2017

DawoudIO Mar 5, 2017

simonkp Mar 6, 2017

DawoudIO Mar 5, 2017

DawoudIO Mar 5, 2017

DawoudIO Mar 5, 2017

simonkp Mar 6, 2017

DawoudIO commented Mar 8, 2017

DawoudIO commented Mar 8, 2017

		@@ -0,0 +1,6 @@
		UPDATE `menuconfig_mcf` SET content_english = 'View Active Families', `content` = 'View Active Families' WHERE `mid` = 15;

		DELETE FROM `menuconfig_mcf` where `mid` = 16 ;

#1872 update pages for deactivated families #2046

#1872 update pages for deactivated families #2046

Conversation

simonkp commented Mar 4, 2017 • edited Loading

DawoudIO 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

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

DawoudIO commented Mar 8, 2017

DawoudIO commented Mar 8, 2017

simonkp commented Mar 4, 2017 •

edited

Loading