jon48 / webtrees-lib

src/Webtrees/Module/Sosa/SosaListController.php

Spacing +47 added lines, -47 removed lines

@@ -69,7 +69,7 @@ 
         $this->view_bag = new ViewBag();
         $this->view_bag->set('generation', $this->generation);
         $this->view_bag->set('max_gen', $this->sosa_provider->getLastGeneration());
-        $this->view_bag->set('is_setup', $this->sosa_provider->isSetup() && $this->view_bag->get('max_gen', 0)> 0);
+        $this->view_bag->set('is_setup', $this->sosa_provider->isSetup() && $this->view_bag->get('max_gen', 0) > 0);
         
     }
     
@@ -89,14 +89,14 @@ 
 
         $this->view_bag->set('title', $controller->getPageTitle());
         
-        if($this->view_bag->get('is_setup', false)) {
+        if ($this->view_bag->get('is_setup', false)) {
             $this->view_bag->set('has_sosa', $this->generation > 0 && $this->sosa_provider->getSosaCountAtGeneration($this->generation) > 0);
             $this->view_bag->set('url_module', $this->module->getName());
             $this->view_bag->set('url_action', 'SosaList');
             $this->view_bag->set('url_ged', $wt_tree->getNameUrl()); 
             $this->view_bag->set('min_gen', 1);
             
-            if($this->view_bag->get('has_sosa', false)) {            
+            if ($this->view_bag->get('has_sosa', false)) {            
                 $controller->addInlineJavascript('
             		jQuery("#sosalist-tabs").tabs();
             		jQuery("#sosalist-tabs").css("visibility", "visible");
@@ -106,7 +106,7 @@ 
             			{
                             "mod" : "'.$this->module->getName().'",
                             "mod_action": "SosaList@sosalist",
-                            "ged" : "' . $wt_tree->getNameUrl(). '",
+                            "ged" : "' . $wt_tree->getNameUrl().'",
                             "type" : "indi",
                             "gen" : "'.$this->generation.'"
                         },
@@ -131,7 +131,7 @@ 
                         {
                             "mod" : "'.$this->module->getName().'",
                             "mod_action": "SosaList@sosalist",
-                            "ged" : "' . $wt_tree->getNameUrl(). '",
+                            "ged" : "' . $wt_tree->getNameUrl().'",
                             "type" : "fam",
                             "gen" : "'.$this->generation.'"
                         },
@@ -169,7 +169,7 @@ 
         
         $this->view_bag->set('title', $controller->getPageTitle());
         
-        if($this->view_bag->get('is_setup', false)) {
+        if ($this->view_bag->get('is_setup', false)) {
             $this->view_bag->set('url_module', $this->module->getName());
             $this->view_bag->set('url_action', 'SosaList@missing');
             $this->view_bag->set('url_ged', $wt_tree->getNameUrl());
@@ -178,11 +178,11 @@ 
             $missing_list = $this->sosa_provider->getMissingSosaListAtGeneration($this->generation);
             $this->view_bag->set('has_missing', $this->generation > 0 && count($missing_list) > 0);
             
-            $perc_sosa = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation), pow(2, $this->generation -1));
+            $perc_sosa = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation), pow(2, $this->generation - 1));
             $this->view_bag->set('perc_sosa', $perc_sosa);
             
-            if($this->view_bag->get('has_missing', false)) {
-                $table_id = 'table-sosa-missing-' . Uuid::uuid4();
+            if ($this->view_bag->get('has_missing', false)) {
+                $table_id = 'table-sosa-missing-'.Uuid::uuid4();
                 $this->view_bag->set('table_id', $table_id);
                 
                 $controller
@@ -192,7 +192,7 @@ 
 				    jQuery.fn.dataTableExt.oSort["text-desc"] = textCompareDesc;
                     
     				jQuery("#'.$table_id.'").dataTable( {
-                        dom: \'<"H"<"filtersH_' . $table_id . '">T<"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_' . $table_id . '">>\',
+                        dom: \'<"H"<"filtersH_' . $table_id.'">T<"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_'.$table_id.'">>\',
     					'.I18N::datatablesI18N().',
     					jQueryUI: true,
     					autoWidth:false,
@@ -218,14 +218,14 @@ 
     					pagingType: "full_numbers"
     			   });
     			
-    				jQuery("#' . $table_id . '")
+    				jQuery("#' . $table_id.'")
     				/* Filter buttons in table header */
     				.on("click", "button[data-filter-column]", function() {
     					var btn = jQuery(this);
     					// De-activate the other buttons in this button group
     					btn.siblings().removeClass("ui-state-active");
     					// Apply (or clear) this filter
-    					var col = jQuery("#' . $table_id . '").DataTable().column(btn.data("filter-column"));
+    					var col = jQuery("#' . $table_id.'").DataTable().column(btn.data("filter-column"));
     					if (btn.hasClass("ui-state-active")) {
     						btn.removeClass("ui-state-active");
     						col.search("").draw();
@@ -242,8 +242,8 @@ 
                 $unique_indis = array();
                 $sum_missing_different = 0;
                 $sum_missing_different_without_hidden = 0;
-                foreach($missing_list as $num => $missing_tab) {
-                    if(isset($unique_indis[$missing_tab['indi']])) {
+                foreach ($missing_list as $num => $missing_tab) {
+                    if (isset($unique_indis[$missing_tab['indi']])) {
                         unset($missing_list[$num]);
                         continue;
                     }
@@ -261,7 +261,7 @@ 
                 $this->view_bag->set('missing_list', $missing_list);
                 $this->view_bag->set('missing_diff_count', $sum_missing_different);
                 $this->view_bag->set('missing_hidden', $sum_missing_different - $sum_missing_different_without_hidden);
-                $perc_sosa_potential = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation - 1), pow(2, $this->generation-2));
+                $perc_sosa_potential = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation - 1), pow(2, $this->generation - 2));
                 $this->view_bag->set('perc_sosa_potential', $perc_sosa_potential);
             }            
         }
@@ -279,7 +279,7 @@ 
         $controller = new AjaxController();
         $controller->restrictAccess($this->generation > 0 || !is_null($type));
         
-        switch ($type){
+        switch ($type) {
             case 'indi':
                 $this->renderSosaListIndi($controller);
                 break;
@@ -301,9 +301,9 @@ 
         $listSosa = $this->sosa_provider->getSosaListAtGeneration($this->generation); 
         $this->view_bag->set('has_sosa', false);
         
-        if(count($listSosa) > 0) {
+        if (count($listSosa) > 0) {
             $this->view_bag->set('has_sosa', true);
-            $table_id = 'table-sosa-indi-' . Uuid::uuid4();
+            $table_id = 'table-sosa-indi-'.Uuid::uuid4();
             $this->view_bag->set('table_id', $table_id);
                      
             $controller
@@ -313,8 +313,8 @@ 
                 jQuery.fn.dataTableExt.oSort["text-desc"] = textCompareDesc;
                 
                 jQuery("#'.$table_id.'").dataTable( {
-					dom: \'<"H"<"filtersH_' . $table_id . '">T<"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_' . $table_id . '">>\',
-					' . I18N::datatablesI18N() . ',
+					dom: \'<"H"<"filtersH_' . $table_id.'">T<"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_'.$table_id.'">>\',
+					' . I18N::datatablesI18N().',
 					jQueryUI: true,
 					autoWidth: false,
 					processing: true,
@@ -343,7 +343,7 @@ 
 					pagingType: "full_numbers"
 			   });
             
-				jQuery("#' . $table_id . '")
+				jQuery("#' . $table_id.'")
 				/* Hide/show parents */
 				.on("click", ".btn-toggle-parents", function() {
 					jQuery(this).toggleClass("ui-state-active");
@@ -352,7 +352,7 @@ 
 				/* Hide/show statistics */
 				.on("click", ".btn-toggle-statistics", function() {
 					jQuery(this).toggleClass("ui-state-active");
-					jQuery("#indi_list_table-charts_' . $table_id . '").slideToggle();
+					jQuery("#indi_list_table-charts_' . $table_id.'").slideToggle();
 				})
 				/* Filter buttons in table header */
 				.on("click", "button[data-filter-column]", function() {
@@ -360,7 +360,7 @@ 
 					// De-activate the other buttons in this button group
 					btn.siblings().removeClass("ui-state-active");
 					// Apply (or clear) this filter
-					var col = jQuery("#' . $table_id . '").DataTable().column(btn.data("filter-column"));
+					var col = jQuery("#' . $table_id.'").DataTable().column(btn.data("filter-column"));
 					if (btn.hasClass("ui-state-active")) {
 						btn.removeClass("ui-state-active");
 						col.search("").draw();
@@ -395,30 +395,30 @@ 
             $nb_displayed = 0;
             
             Individual::load($wt_tree, $listSosa);
-            foreach($listSosa as $sosa => $pid) {
+            foreach ($listSosa as $sosa => $pid) {
                 $person = Individual::getInstance($pid, $wt_tree);
                 if (!$person || !$person->canShowName()) {
                     unset($listSosa[$sosa]);
                     continue;
                 }
                 $nb_displayed++;
-                if ($birth_dates=$person->getAllBirthDates()) {
+                if ($birth_dates = $person->getAllBirthDates()) {
                     if (
                         FunctionsPrint::isDateWithinChartsRange($birth_dates[0]) &&
                         !isset($unique_indis[$person->getXref()])
                         ) {
-                        $birt_by_decade[(int)($birth_dates[0]->gregorianYear()/10)*10] .= $person->getSex();
+                        $birt_by_decade[(int)($birth_dates[0]->gregorianYear() / 10) * 10] .= $person->getSex();
                     }
                 }
                 else {
-                    $birth_dates[0]=new Date('');
+                    $birth_dates[0] = new Date('');
                 }
                 if ($death_dates = $person->getAllDeathDates()) {
                     if (
                         FunctionsPrint::isDateWithinChartsRange($death_dates[0]) &&
                         !isset($unique_indis[$person->getXref()])
                         ) {
-                        $deat_by_decade[(int) ($death_dates[0]->gregorianYear() / 10) * 10] .= $person->getSex();
+                        $deat_by_decade[(int)($death_dates[0]->gregorianYear() / 10) * 10] .= $person->getSex();
                     }
                 }
                 else {
@@ -434,7 +434,7 @@ 
             $this->view_bag->set('sosa_list', $listSosa);   
             
             $this->view_bag->set('sosa_count', count($listSosa));
-            $this->view_bag->set('sosa_theo', pow(2, $this->generation-1));
+            $this->view_bag->set('sosa_theo', pow(2, $this->generation - 1));
             $this->view_bag->set('sosa_ratio', Functions::safeDivision($this->view_bag->get('sosa_count'), $this->view_bag->get('sosa_theo')));
             
             $this->view_bag->set('sosa_hidden', $this->view_bag->get('sosa_count') - $nb_displayed);
@@ -453,12 +453,12 @@ 
      */
     protected function renderFamSosaListIndi(AjaxController $controller) {
         $wt_tree = Globals::getTree();
-        $listFamSosa = $this->sosa_provider->getFamilySosaListAtGeneration($this->generation);;
+        $listFamSosa = $this->sosa_provider->getFamilySosaListAtGeneration($this->generation); ;
         $this->view_bag->set('has_sosa', false);
         
-        if(count($listFamSosa) > 0) {
+        if (count($listFamSosa) > 0) {
             $this->view_bag->set('has_sosa', true);
-            $table_id = 'table-sosa-fam-' . Uuid::uuid4();
+            $table_id = 'table-sosa-fam-'.Uuid::uuid4();
             $this->view_bag->set('table_id', $table_id);
              
             $controller
@@ -468,7 +468,7 @@ 
 				jQuery.fn.dataTableExt.oSort["text-desc"] = textCompareDesc;
                 
                 jQuery("#'.$table_id.'").dataTable( {
-					dom: \'<"H"<"filtersH_' . $table_id . '"><"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_' . $table_id . '">>\',
+					dom: \'<"H"<"filtersH_' . $table_id.'"><"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_'.$table_id.'">>\',
                     '.I18N::datatablesI18N(array(16, 32, 64, 128, -1)).',
 					jQueryUI: true,
 					autoWidth: false,
@@ -495,7 +495,7 @@ 
 					pagingType: "full_numbers"
 			   });
 					
-				jQuery("#' . $table_id . '")
+				jQuery("#' . $table_id.'")
 				/* Hide/show parents */
 				.on("click", ".btn-toggle-parents", function() {
 					jQuery(this).toggleClass("ui-state-active");
@@ -504,7 +504,7 @@ 
 				/* Hide/show statistics */
 				.on("click",  ".btn-toggle-statistics", function() {
 					jQuery(this).toggleClass("ui-state-active");
-					jQuery("#fam_list_table-charts_' . $table_id . '").slideToggle();
+					jQuery("#fam_list_table-charts_' . $table_id.'").slideToggle();
 				})
 				/* Filter buttons in table header */
 				.on("click", "button[data-filter-column]", function() {
@@ -512,7 +512,7 @@ 
 					// De-activate the other buttons in this button group
 					btn.siblings().removeClass("ui-state-active");
 					// Apply (or clear) this filter
-					var col = jQuery("#' . $table_id . '").DataTable().column(btn.data("filter-column"));
+					var col = jQuery("#' . $table_id.'").DataTable().column(btn.data("filter-column"));
 					if (btn.hasClass("ui-state-active")) {
 						btn.removeClass("ui-state-active");
 						col.search("").draw();
@@ -532,29 +532,29 @@ 
             
             //-- init chart data
     		$marr_by_age = array();
-    		for ($age=0; $age<=$max_age; $age++) {
+    		for ($age = 0; $age <= $max_age; $age++) {
     			$marr_by_age[$age] = '';
     		}
     		$birt_by_decade = array();
     		$marr_by_decade = array();
-    		for ($year=1550; $year<2030; $year+=10) {
+    		for ($year = 1550; $year < 2030; $year += 10) {
     			$birt_by_decade[$year] = '';
     			$marr_by_decade[$year] = '';
     		}
     		
-            foreach($listFamSosa as $sosa => $fid) {
+            foreach ($listFamSosa as $sosa => $fid) {
                 $sfamily = Family::getInstance($fid, $wt_tree);
-                if(!$sfamily || !$sfamily->canShow()) {
+                if (!$sfamily || !$sfamily->canShow()) {
                     unset($listFamSosa[$sosa]);
                     continue;
                 }
-                $mdate=$sfamily->getMarriageDate();
+                $mdate = $sfamily->getMarriageDate();
                 
-                if( ($husb = $sfamily->getHusband()) && 
+                if (($husb = $sfamily->getHusband()) && 
                     ($hdate = $husb->getBirthDate()) && 
                     $hdate->isOK() && $mdate->isOK()) {
                     if (FunctionsPrint::isDateWithinChartsRange($hdate)) {
-                        $birt_by_decade[(int) ($hdate->gregorianYear() / 10) * 10] .= $husb->getSex();
+                        $birt_by_decade[(int)($hdate->gregorianYear() / 10) * 10] .= $husb->getSex();
                     }
                     $hage = Date::getAge($hdate, $mdate, 0);
                     if ($hage >= 0 && $hage <= $max_age) {
@@ -562,11 +562,11 @@ 
                     }
                 }
                 
-                if(($wife = $sfamily->getWife()) &&
-                    ($wdate=$wife->getBirthDate()) &&
+                if (($wife = $sfamily->getWife()) &&
+                    ($wdate = $wife->getBirthDate()) &&
                     $wdate->isOK() && $mdate->isOK()) {
                     if (FunctionsPrint::isDateWithinChartsRange($wdate)) {
-                        $birt_by_decade[(int) ($wdate->gregorianYear() / 10) * 10] .= $wife->getSex();
+                        $birt_by_decade[(int)($wdate->gregorianYear() / 10) * 10] .= $wife->getSex();
                     }
                     $wage = Date::getAge($wdate, $mdate, 0);
                     if ($wage >= 0 && $wage <= $max_age) {
@@ -575,7 +575,7 @@ 
                 }                
 
                 if ($mdate->isOK() && FunctionsPrint::isDateWithinChartsRange($mdate) && $husb && $wife) {
-                    $marr_by_decade[(int) ($mdate->gregorianYear() / 10) * 10] .= $husb->getSex() . $wife->getSex();
+                    $marr_by_decade[(int)($mdate->gregorianYear() / 10) * 10] .= $husb->getSex().$wife->getSex();
                 }
                 
                 $listFamSosa[$sosa] = $sfamily;