@@ -26,11 +26,11 @@ discard block |
||
26 | 26 | * {@inhericDoc} |
27 | 27 | * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent() |
28 | 28 | */ |
29 | - protected function renderContent() { |
|
29 | + protected function renderContent() { |
|
30 | 30 | |
31 | - /** @var AbstractTask $task */ |
|
32 | - $task = $this->data->get('task'); |
|
33 | - ?> |
|
31 | + /** @var AbstractTask $task */ |
|
32 | + $task = $this->data->get('task'); |
|
33 | + ?> |
|
34 | 34 | <ol class="breadcrumb small"> |
35 | 35 | <li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li> |
36 | 36 | <li><a href="admin_modules.php"><?php echo I18N::translate('Module administration'); ?></a></li> |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | </form> |
123 | 123 | |
124 | 124 | <?php |
125 | - } |
|
125 | + } |
|
126 | 126 | |
127 | 127 | } |
128 | 128 | |
129 | 129 | \ No newline at end of file |
@@ -104,7 +104,7 @@ |
||
104 | 104 | </div> |
105 | 105 | </div> |
106 | 106 | |
107 | - <?php if($task instanceof ConfigurableTaskInterface) { ?> |
|
107 | + <?php if ($task instanceof ConfigurableTaskInterface) { ?> |
|
108 | 108 | |
109 | 109 | <h3><?php echo I18N::translate('Options for “%s”', $task->getTitle()); ?></h3> |
110 | 110 |
@@ -22,10 +22,10 @@ discard block |
||
22 | 22 | * {@inhericDoc} |
23 | 23 | * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent() |
24 | 24 | */ |
25 | - protected function renderContent() { |
|
25 | + protected function renderContent() { |
|
26 | 26 | |
27 | - $table_id = $this->data->get('table_id'); |
|
28 | - ?> |
|
27 | + $table_id = $this->data->get('table_id'); |
|
28 | + ?> |
|
29 | 29 | <ol class="breadcrumb small"> |
30 | 30 | <li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li> |
31 | 31 | <li><a href="admin_modules.php"><?php echo I18N::translate('Module administration'); ?></a></li> |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | </table> |
69 | 69 | |
70 | 70 | <?php |
71 | - } |
|
71 | + } |
|
72 | 72 | |
73 | 73 | } |
74 | 74 | |
75 | 75 | \ No newline at end of file |
@@ -40,7 +40,7 @@ |
||
40 | 40 | <?php echo I18N::translate('In order to do so, use the following URL, with the optional parameter <em>%s</em> if you only want to force the execution of one task: ', 'task'); ?> |
41 | 41 | </p> |
42 | 42 | <p> |
43 | - <code><?php echo $this->data->get('trigger_url_root') .'&force=<span id="token_url">'. $this->data->get('trigger_token') .'</span>[&task='. I18N::translate('task_name').']'; ?></code> |
|
43 | + <code><?php echo $this->data->get('trigger_url_root').'&force=<span id="token_url">'.$this->data->get('trigger_token').'</span>[&task='.I18N::translate('task_name').']'; ?></code> |
|
44 | 44 | </p> |
45 | 45 | <p> |
46 | 46 | <button id="bt_genforcetoken" class="bt bt-primary" onClick="generate_force_token();"> |
@@ -29,66 +29,66 @@ discard block |
||
29 | 29 | */ |
30 | 30 | class SosaConfigController extends MvcController |
31 | 31 | { |
32 | - /** |
|
33 | - * Check if the user can update the sosa ancestors list |
|
34 | - * |
|
35 | - * @return bool |
|
36 | - */ |
|
37 | - protected function canUpdate() { |
|
38 | - global $WT_TREE; |
|
32 | + /** |
|
33 | + * Check if the user can update the sosa ancestors list |
|
34 | + * |
|
35 | + * @return bool |
|
36 | + */ |
|
37 | + protected function canUpdate() { |
|
38 | + global $WT_TREE; |
|
39 | 39 | |
40 | - $user_id = Filter::postInteger('userid', -1) ?: Filter::getInteger('userid', -1); |
|
41 | - return Auth::check() && |
|
42 | - ( |
|
43 | - $user_id == Auth::user()->getUserId() || // Allow update for yourself |
|
44 | - ($user_id == -1 && Auth::isManager($WT_TREE)) // Allow a manager to update the default user |
|
45 | - ); |
|
46 | - } |
|
40 | + $user_id = Filter::postInteger('userid', -1) ?: Filter::getInteger('userid', -1); |
|
41 | + return Auth::check() && |
|
42 | + ( |
|
43 | + $user_id == Auth::user()->getUserId() || // Allow update for yourself |
|
44 | + ($user_id == -1 && Auth::isManager($WT_TREE)) // Allow a manager to update the default user |
|
45 | + ); |
|
46 | + } |
|
47 | 47 | |
48 | - /** |
|
49 | - * Saves Sosa's user preferences (root individual for the user). |
|
50 | - * |
|
51 | - * @param BaseController $controller |
|
52 | - * @return bool True is saving successfull |
|
53 | - */ |
|
54 | - protected function update(BaseController $controller) { |
|
55 | - global $WT_TREE; |
|
56 | - if($this->canUpdate() && Filter::checkCsrf()) |
|
57 | - { |
|
58 | - $indi = Individual::getInstance(Filter::post('rootid'), $WT_TREE); |
|
59 | - $user = User::find(Filter::postInteger('userid', -1)); |
|
48 | + /** |
|
49 | + * Saves Sosa's user preferences (root individual for the user). |
|
50 | + * |
|
51 | + * @param BaseController $controller |
|
52 | + * @return bool True is saving successfull |
|
53 | + */ |
|
54 | + protected function update(BaseController $controller) { |
|
55 | + global $WT_TREE; |
|
56 | + if($this->canUpdate() && Filter::checkCsrf()) |
|
57 | + { |
|
58 | + $indi = Individual::getInstance(Filter::post('rootid'), $WT_TREE); |
|
59 | + $user = User::find(Filter::postInteger('userid', -1)); |
|
60 | 60 | |
61 | - if($user && $indi) { |
|
62 | - $WT_TREE->setUserPreference($user, 'MAJ_SOSA_ROOT_ID', $indi->getXref()); |
|
63 | - $controller->addInlineJavascript(' |
|
61 | + if($user && $indi) { |
|
62 | + $WT_TREE->setUserPreference($user, 'MAJ_SOSA_ROOT_ID', $indi->getXref()); |
|
63 | + $controller->addInlineJavascript(' |
|
64 | 64 | $( document ).ready(function() { |
65 | 65 | majComputeSosa('.$user->getUserId().'); |
66 | 66 | });'); |
67 | - FlashMessages::addMessage(I18N::translate('The preferences have been updated.')); |
|
68 | - return true; |
|
69 | - } |
|
70 | - } |
|
71 | - FlashMessages::addMessage(I18N::translate('An error occurred while saving data...'), 'danger'); |
|
72 | - return false; |
|
73 | - } |
|
67 | + FlashMessages::addMessage(I18N::translate('The preferences have been updated.')); |
|
68 | + return true; |
|
69 | + } |
|
70 | + } |
|
71 | + FlashMessages::addMessage(I18N::translate('An error occurred while saving data...'), 'danger'); |
|
72 | + return false; |
|
73 | + } |
|
74 | 74 | |
75 | - /** |
|
76 | - * Pages |
|
77 | - */ |
|
75 | + /** |
|
76 | + * Pages |
|
77 | + */ |
|
78 | 78 | |
79 | - /** |
|
80 | - * SosaConfig@index |
|
81 | - */ |
|
82 | - public function index() { |
|
83 | - global $WT_TREE; |
|
79 | + /** |
|
80 | + * SosaConfig@index |
|
81 | + */ |
|
82 | + public function index() { |
|
83 | + global $WT_TREE; |
|
84 | 84 | |
85 | - $controller = new PageController(); |
|
86 | - $controller |
|
87 | - ->setPageTitle(I18N::translate('Sosa Configuration')) |
|
88 | - ->restrictAccess(Auth::check()) |
|
89 | - ->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL) |
|
90 | - ->addInlineJavascript('autocomplete();') |
|
91 | - ->addInlineJavascript(' |
|
85 | + $controller = new PageController(); |
|
86 | + $controller |
|
87 | + ->setPageTitle(I18N::translate('Sosa Configuration')) |
|
88 | + ->restrictAccess(Auth::check()) |
|
89 | + ->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL) |
|
90 | + ->addInlineJavascript('autocomplete();') |
|
91 | + ->addInlineJavascript(' |
|
92 | 92 | $( document ).ready(function() { |
93 | 93 | $("#bt_sosa_compute").click(function() { |
94 | 94 | majComputeSosa($("#maj_sosa_input_userid, #maj-sosa-config-select option:selected").val()); |
@@ -105,83 +105,83 @@ discard block |
||
105 | 105 | }); |
106 | 106 | }'); |
107 | 107 | |
108 | - $action = Filter::post('action'); |
|
109 | - if($action === 'update') $this->update($controller); |
|
108 | + $action = Filter::post('action'); |
|
109 | + if($action === 'update') $this->update($controller); |
|
110 | 110 | |
111 | - $view_bag = new ViewBag(); |
|
112 | - $view_bag->set('title', $controller->getPageTitle()); |
|
113 | - $view_bag->set('tree', $WT_TREE); |
|
114 | - $view_bag->set('form_url', 'module.php?mod='.$this->module->getName().'&mod_action=SosaConfig&ged='.$WT_TREE->getNameUrl()); |
|
111 | + $view_bag = new ViewBag(); |
|
112 | + $view_bag->set('title', $controller->getPageTitle()); |
|
113 | + $view_bag->set('tree', $WT_TREE); |
|
114 | + $view_bag->set('form_url', 'module.php?mod='.$this->module->getName().'&mod_action=SosaConfig&ged='.$WT_TREE->getNameUrl()); |
|
115 | 115 | |
116 | - $users_root = array(); |
|
117 | - $users_js_array = 'var users_array = [];'; |
|
118 | - if(Auth::check()) { |
|
119 | - $root_id = $WT_TREE->getUserPreference(Auth::user(), 'MAJ_SOSA_ROOT_ID'); |
|
120 | - $users_root[] = array( 'user' => Auth::user(), 'rootid' => $root_id); |
|
121 | - $users_js_array .= 'users_array["'.Auth::user()->getUserId().'"] = "' . $root_id . '";'; |
|
116 | + $users_root = array(); |
|
117 | + $users_js_array = 'var users_array = [];'; |
|
118 | + if(Auth::check()) { |
|
119 | + $root_id = $WT_TREE->getUserPreference(Auth::user(), 'MAJ_SOSA_ROOT_ID'); |
|
120 | + $users_root[] = array( 'user' => Auth::user(), 'rootid' => $root_id); |
|
121 | + $users_js_array .= 'users_array["'.Auth::user()->getUserId().'"] = "' . $root_id . '";'; |
|
122 | 122 | |
123 | - if(Auth::isManager($WT_TREE)) { |
|
124 | - $default_user = User::find(-1); |
|
125 | - $default_root_id = $WT_TREE->getUserPreference($default_user, 'MAJ_SOSA_ROOT_ID'); |
|
126 | - $users_root[] = array( 'user' => $default_user, 'rootid' => $default_root_id); |
|
127 | - $users_js_array .= 'users_array["'.$default_user->getUserId().'"] = "' . $default_root_id . '";'; |
|
128 | - } |
|
129 | - } |
|
130 | - $view_bag->set('users_settings', $users_root); |
|
123 | + if(Auth::isManager($WT_TREE)) { |
|
124 | + $default_user = User::find(-1); |
|
125 | + $default_root_id = $WT_TREE->getUserPreference($default_user, 'MAJ_SOSA_ROOT_ID'); |
|
126 | + $users_root[] = array( 'user' => $default_user, 'rootid' => $default_root_id); |
|
127 | + $users_js_array .= 'users_array["'.$default_user->getUserId().'"] = "' . $default_root_id . '";'; |
|
128 | + } |
|
129 | + } |
|
130 | + $view_bag->set('users_settings', $users_root); |
|
131 | 131 | |
132 | - $controller->addInlineJavascript($users_js_array . ' |
|
132 | + $controller->addInlineJavascript($users_js_array . ' |
|
133 | 133 | $("#maj-sosa-config-select").change(function() { |
134 | 134 | $("#rootid").val(users_array[this.value]); |
135 | 135 | }); |
136 | 136 | '); |
137 | 137 | |
138 | - ViewFactory::make('SosaConfig', $this, $controller, $view_bag)->render(); |
|
139 | - } |
|
138 | + ViewFactory::make('SosaConfig', $this, $controller, $view_bag)->render(); |
|
139 | + } |
|
140 | 140 | |
141 | - /** |
|
142 | - * SosaConfig@computeAll |
|
143 | - */ |
|
144 | - public function computeAll() { |
|
145 | - global $WT_TREE; |
|
141 | + /** |
|
142 | + * SosaConfig@computeAll |
|
143 | + */ |
|
144 | + public function computeAll() { |
|
145 | + global $WT_TREE; |
|
146 | 146 | |
147 | - $controller = new AjaxController(); |
|
148 | - $controller->restrictAccess($this->canUpdate()); |
|
147 | + $controller = new AjaxController(); |
|
148 | + $controller->restrictAccess($this->canUpdate()); |
|
149 | 149 | |
150 | - $view_bag = new ViewBag(); |
|
151 | - $view_bag->set('is_success', false); |
|
150 | + $view_bag = new ViewBag(); |
|
151 | + $view_bag->set('is_success', false); |
|
152 | 152 | |
153 | - $user = User::find(Filter::getInteger('userid', -1)); |
|
154 | - if($user) { |
|
155 | - $calculator = new SosaCalculator($WT_TREE, $user); |
|
156 | - if($calculator->computeAll()) $view_bag->set('is_success', true); |
|
157 | - } |
|
158 | - ViewFactory::make('SosaComputeResult', $this, $controller, $view_bag)->render(); |
|
159 | - } |
|
153 | + $user = User::find(Filter::getInteger('userid', -1)); |
|
154 | + if($user) { |
|
155 | + $calculator = new SosaCalculator($WT_TREE, $user); |
|
156 | + if($calculator->computeAll()) $view_bag->set('is_success', true); |
|
157 | + } |
|
158 | + ViewFactory::make('SosaComputeResult', $this, $controller, $view_bag)->render(); |
|
159 | + } |
|
160 | 160 | |
161 | - /** |
|
162 | - * SosaConfig@computePartial |
|
163 | - */ |
|
164 | - public function computePartial() { |
|
165 | - global $WT_TREE; |
|
161 | + /** |
|
162 | + * SosaConfig@computePartial |
|
163 | + */ |
|
164 | + public function computePartial() { |
|
165 | + global $WT_TREE; |
|
166 | 166 | |
167 | - $controller = new AjaxController(); |
|
168 | - $controller->restrictAccess($this->canUpdate()); |
|
167 | + $controller = new AjaxController(); |
|
168 | + $controller->restrictAccess($this->canUpdate()); |
|
169 | 169 | |
170 | - $view_bag = new ViewBag(); |
|
171 | - $view_bag->set('is_success', false); |
|
170 | + $view_bag = new ViewBag(); |
|
171 | + $view_bag->set('is_success', false); |
|
172 | 172 | |
173 | - $user = User::find(Filter::getInteger('userid', -1)); |
|
174 | - $indi = Individual::getInstance(Filter::get('pid', WT_REGEX_XREF), $WT_TREE); |
|
173 | + $user = User::find(Filter::getInteger('userid', -1)); |
|
174 | + $indi = Individual::getInstance(Filter::get('pid', WT_REGEX_XREF), $WT_TREE); |
|
175 | 175 | |
176 | - if($user && $indi) { |
|
177 | - $calculator = new SosaCalculator($WT_TREE, $user); |
|
178 | - if($calculator->computeFromIndividual($indi)) $view_bag->set('is_success', true); |
|
179 | - } |
|
180 | - else { |
|
181 | - $view_bag->set('error', I18N::translate('Non existing individual')); |
|
182 | - } |
|
176 | + if($user && $indi) { |
|
177 | + $calculator = new SosaCalculator($WT_TREE, $user); |
|
178 | + if($calculator->computeFromIndividual($indi)) $view_bag->set('is_success', true); |
|
179 | + } |
|
180 | + else { |
|
181 | + $view_bag->set('error', I18N::translate('Non existing individual')); |
|
182 | + } |
|
183 | 183 | |
184 | - ViewFactory::make('SosaComputeResult', $this, $controller, $view_bag)->render(); |
|
185 | - } |
|
184 | + ViewFactory::make('SosaComputeResult', $this, $controller, $view_bag)->render(); |
|
185 | + } |
|
186 | 186 | |
187 | 187 | } |
188 | 188 | \ No newline at end of file |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | $user_id = Filter::postInteger('userid', -1) ?: Filter::getInteger('userid', -1); |
41 | 41 | return Auth::check() && |
42 | 42 | ( |
43 | - $user_id == Auth::user()->getUserId() || // Allow update for yourself |
|
43 | + $user_id == Auth::user()->getUserId() || // Allow update for yourself |
|
44 | 44 | ($user_id == -1 && Auth::isManager($WT_TREE)) // Allow a manager to update the default user |
45 | 45 | ); |
46 | 46 | } |
@@ -53,12 +53,12 @@ discard block |
||
53 | 53 | */ |
54 | 54 | protected function update(BaseController $controller) { |
55 | 55 | global $WT_TREE; |
56 | - if($this->canUpdate() && Filter::checkCsrf()) |
|
56 | + if ($this->canUpdate() && Filter::checkCsrf()) |
|
57 | 57 | { |
58 | 58 | $indi = Individual::getInstance(Filter::post('rootid'), $WT_TREE); |
59 | 59 | $user = User::find(Filter::postInteger('userid', -1)); |
60 | 60 | |
61 | - if($user && $indi) { |
|
61 | + if ($user && $indi) { |
|
62 | 62 | $WT_TREE->setUserPreference($user, 'MAJ_SOSA_ROOT_ID', $indi->getXref()); |
63 | 63 | $controller->addInlineJavascript(' |
64 | 64 | $( document ).ready(function() { |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | |
98 | 98 | function majComputeSosa(user_id) { |
99 | 99 | jQuery("#bt_sosa_compute").prop( "disabled", true ); |
100 | - jQuery("#bt_sosa_computing").empty().html("<i class=\"icon-loading-small\"></i> '. I18N::translate('Computing...') .'"); |
|
100 | + jQuery("#bt_sosa_computing").empty().html("<i class=\"icon-loading-small\"></i> '. I18N::translate('Computing...').'"); |
|
101 | 101 | jQuery("#bt_sosa_computing").load( |
102 | 102 | "module.php?mod='.$this->module->getName().'&mod_action=SosaConfig@computeAll&ged='.$WT_TREE->getNameUrl().'&userid=" + user_id, |
103 | 103 | function() { |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | }'); |
107 | 107 | |
108 | 108 | $action = Filter::post('action'); |
109 | - if($action === 'update') $this->update($controller); |
|
109 | + if ($action === 'update') $this->update($controller); |
|
110 | 110 | |
111 | 111 | $view_bag = new ViewBag(); |
112 | 112 | $view_bag->set('title', $controller->getPageTitle()); |
@@ -115,21 +115,21 @@ discard block |
||
115 | 115 | |
116 | 116 | $users_root = array(); |
117 | 117 | $users_js_array = 'var users_array = [];'; |
118 | - if(Auth::check()) { |
|
118 | + if (Auth::check()) { |
|
119 | 119 | $root_id = $WT_TREE->getUserPreference(Auth::user(), 'MAJ_SOSA_ROOT_ID'); |
120 | - $users_root[] = array( 'user' => Auth::user(), 'rootid' => $root_id); |
|
121 | - $users_js_array .= 'users_array["'.Auth::user()->getUserId().'"] = "' . $root_id . '";'; |
|
120 | + $users_root[] = array('user' => Auth::user(), 'rootid' => $root_id); |
|
121 | + $users_js_array .= 'users_array["'.Auth::user()->getUserId().'"] = "'.$root_id.'";'; |
|
122 | 122 | |
123 | - if(Auth::isManager($WT_TREE)) { |
|
123 | + if (Auth::isManager($WT_TREE)) { |
|
124 | 124 | $default_user = User::find(-1); |
125 | 125 | $default_root_id = $WT_TREE->getUserPreference($default_user, 'MAJ_SOSA_ROOT_ID'); |
126 | - $users_root[] = array( 'user' => $default_user, 'rootid' => $default_root_id); |
|
127 | - $users_js_array .= 'users_array["'.$default_user->getUserId().'"] = "' . $default_root_id . '";'; |
|
126 | + $users_root[] = array('user' => $default_user, 'rootid' => $default_root_id); |
|
127 | + $users_js_array .= 'users_array["'.$default_user->getUserId().'"] = "'.$default_root_id.'";'; |
|
128 | 128 | } |
129 | 129 | } |
130 | 130 | $view_bag->set('users_settings', $users_root); |
131 | 131 | |
132 | - $controller->addInlineJavascript($users_js_array . ' |
|
132 | + $controller->addInlineJavascript($users_js_array.' |
|
133 | 133 | $("#maj-sosa-config-select").change(function() { |
134 | 134 | $("#rootid").val(users_array[this.value]); |
135 | 135 | }); |
@@ -151,9 +151,9 @@ discard block |
||
151 | 151 | $view_bag->set('is_success', false); |
152 | 152 | |
153 | 153 | $user = User::find(Filter::getInteger('userid', -1)); |
154 | - if($user) { |
|
154 | + if ($user) { |
|
155 | 155 | $calculator = new SosaCalculator($WT_TREE, $user); |
156 | - if($calculator->computeAll()) $view_bag->set('is_success', true); |
|
156 | + if ($calculator->computeAll()) $view_bag->set('is_success', true); |
|
157 | 157 | } |
158 | 158 | ViewFactory::make('SosaComputeResult', $this, $controller, $view_bag)->render(); |
159 | 159 | } |
@@ -173,9 +173,9 @@ discard block |
||
173 | 173 | $user = User::find(Filter::getInteger('userid', -1)); |
174 | 174 | $indi = Individual::getInstance(Filter::get('pid', WT_REGEX_XREF), $WT_TREE); |
175 | 175 | |
176 | - if($user && $indi) { |
|
176 | + if ($user && $indi) { |
|
177 | 177 | $calculator = new SosaCalculator($WT_TREE, $user); |
178 | - if($calculator->computeFromIndividual($indi)) $view_bag->set('is_success', true); |
|
178 | + if ($calculator->computeFromIndividual($indi)) $view_bag->set('is_success', true); |
|
179 | 179 | } |
180 | 180 | else { |
181 | 181 | $view_bag->set('error', I18N::translate('Non existing individual')); |
@@ -106,7 +106,9 @@ discard block |
||
106 | 106 | }'); |
107 | 107 | |
108 | 108 | $action = Filter::post('action'); |
109 | - if($action === 'update') $this->update($controller); |
|
109 | + if($action === 'update') { |
|
110 | + $this->update($controller); |
|
111 | + } |
|
110 | 112 | |
111 | 113 | $view_bag = new ViewBag(); |
112 | 114 | $view_bag->set('title', $controller->getPageTitle()); |
@@ -153,7 +155,9 @@ discard block |
||
153 | 155 | $user = User::find(Filter::getInteger('userid', -1)); |
154 | 156 | if($user) { |
155 | 157 | $calculator = new SosaCalculator($WT_TREE, $user); |
156 | - if($calculator->computeAll()) $view_bag->set('is_success', true); |
|
158 | + if($calculator->computeAll()) { |
|
159 | + $view_bag->set('is_success', true); |
|
160 | + } |
|
157 | 161 | } |
158 | 162 | ViewFactory::make('SosaComputeResult', $this, $controller, $view_bag)->render(); |
159 | 163 | } |
@@ -175,9 +179,10 @@ discard block |
||
175 | 179 | |
176 | 180 | if($user && $indi) { |
177 | 181 | $calculator = new SosaCalculator($WT_TREE, $user); |
178 | - if($calculator->computeFromIndividual($indi)) $view_bag->set('is_success', true); |
|
179 | - } |
|
180 | - else { |
|
182 | + if($calculator->computeFromIndividual($indi)) { |
|
183 | + $view_bag->set('is_success', true); |
|
184 | + } |
|
185 | + } else { |
|
181 | 186 | $view_bag->set('error', I18N::translate('Non existing individual')); |
182 | 187 | } |
183 | 188 |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | $this->tree = $tree; |
59 | 59 | $this->user = $user; |
60 | 60 | |
61 | - $this->sosa_provider = new SosaProvider($this->tree, $this->user);; |
|
61 | + $this->sosa_provider = new SosaProvider($this->tree, $this->user); ; |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | /** |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | public function computeAll() { |
69 | 69 | $root_id = $this->tree->getUserPreference($this->user, 'MAJ_SOSA_ROOT_ID'); |
70 | 70 | $indi = Individual::getInstance($root_id, $this->tree); |
71 | - if($indi){ |
|
71 | + if ($indi) { |
|
72 | 72 | $this->sosa_provider->deleteAll(); |
73 | 73 | $tmp_sosatable = array(); |
74 | 74 | $this->addNode($indi, 1); |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | $tmp_sosatable = array(); |
88 | 88 | $dindi = new \MyArtJaub\Webtrees\Individual($indi); |
89 | 89 | $current_sosas = $dindi->getSosaNumbers(); |
90 | - foreach($current_sosas as $current_sosa => $gen) { |
|
90 | + foreach ($current_sosas as $current_sosa => $gen) { |
|
91 | 91 | $this->sosa_provider->deleteAncestors($current_sosa); |
92 | 92 | $this->addNode($indi, $current_sosa); |
93 | 93 | } |
@@ -113,9 +113,9 @@ discard block |
||
113 | 113 | |
114 | 114 | $this->flushTmpSosaTable(); |
115 | 115 | |
116 | - if($fam = $indi->getPrimaryChildFamily()) { |
|
117 | - if($husb = $fam->getHusband()) $this->addNode($husb, 2 * $sosa); |
|
118 | - if($wife = $fam->getWife()) $this->addNode($wife, 2 * $sosa + 1); |
|
116 | + if ($fam = $indi->getPrimaryChildFamily()) { |
|
117 | + if ($husb = $fam->getHusband()) $this->addNode($husb, 2 * $sosa); |
|
118 | + if ($wife = $fam->getWife()) $this->addNode($wife, 2 * $sosa + 1); |
|
119 | 119 | } |
120 | 120 | } |
121 | 121 | |
@@ -125,8 +125,8 @@ discard block |
||
125 | 125 | * @param bool $force Should the flush be forced |
126 | 126 | */ |
127 | 127 | protected function flushTmpSosaTable($force = false) { |
128 | - if( count($this->tmp_sosa_table)> 0 && |
|
129 | - ($force || count($this->tmp_sosa_table) >= self::TMP_SOSA_TABLE_LIMIT)){ |
|
128 | + if (count($this->tmp_sosa_table) > 0 && |
|
129 | + ($force || count($this->tmp_sosa_table) >= self::TMP_SOSA_TABLE_LIMIT)) { |
|
130 | 130 | $this->sosa_provider->insertOrUpdate($this->tmp_sosa_table); |
131 | 131 | $this->tmp_sosa_table = array(); |
132 | 132 | } |
@@ -114,8 +114,12 @@ |
||
114 | 114 | $this->flushTmpSosaTable(); |
115 | 115 | |
116 | 116 | if($fam = $indi->getPrimaryChildFamily()) { |
117 | - if($husb = $fam->getHusband()) $this->addNode($husb, 2 * $sosa); |
|
118 | - if($wife = $fam->getWife()) $this->addNode($wife, 2 * $sosa + 1); |
|
117 | + if($husb = $fam->getHusband()) { |
|
118 | + $this->addNode($husb, 2 * $sosa); |
|
119 | + } |
|
120 | + if($wife = $fam->getWife()) { |
|
121 | + $this->addNode($wife, 2 * $sosa + 1); |
|
122 | + } |
|
119 | 123 | } |
120 | 124 | } |
121 | 125 |
@@ -19,116 +19,116 @@ |
||
19 | 19 | */ |
20 | 20 | class SosaCalculator { |
21 | 21 | |
22 | - /** |
|
23 | - * Maximium size for the temporary Sosa table |
|
24 | - * @var int TMP_SOSA_TABLE_LIMIT |
|
25 | - */ |
|
26 | - const TMP_SOSA_TABLE_LIMIT = 1000; |
|
22 | + /** |
|
23 | + * Maximium size for the temporary Sosa table |
|
24 | + * @var int TMP_SOSA_TABLE_LIMIT |
|
25 | + */ |
|
26 | + const TMP_SOSA_TABLE_LIMIT = 1000; |
|
27 | 27 | |
28 | - /** |
|
29 | - * Reference user |
|
30 | - * @var Fisharebest\Webtrees\User $user |
|
31 | - */ |
|
32 | - protected $user; |
|
28 | + /** |
|
29 | + * Reference user |
|
30 | + * @var Fisharebest\Webtrees\User $user |
|
31 | + */ |
|
32 | + protected $user; |
|
33 | 33 | |
34 | - /** |
|
35 | - * Reference tree |
|
36 | - * @var Fisharebest\Webtrees\Tree $tree |
|
37 | - */ |
|
38 | - protected $tree; |
|
34 | + /** |
|
35 | + * Reference tree |
|
36 | + * @var Fisharebest\Webtrees\Tree $tree |
|
37 | + */ |
|
38 | + protected $tree; |
|
39 | 39 | |
40 | - /** |
|
41 | - * Sosa Provider for the calculator |
|
42 | - * @var \MyArtJaub\Webtrees\Module\Sosa\Model\SosaCalculator $sosa_provider |
|
43 | - */ |
|
44 | - protected $sosa_provider; |
|
40 | + /** |
|
41 | + * Sosa Provider for the calculator |
|
42 | + * @var \MyArtJaub\Webtrees\Module\Sosa\Model\SosaCalculator $sosa_provider |
|
43 | + */ |
|
44 | + protected $sosa_provider; |
|
45 | 45 | |
46 | - /** |
|
47 | - * Temporary Sosa table, used during construction |
|
48 | - * @var array $tmp_sosa_table |
|
49 | - */ |
|
50 | - protected $tmp_sosa_table; |
|
46 | + /** |
|
47 | + * Temporary Sosa table, used during construction |
|
48 | + * @var array $tmp_sosa_table |
|
49 | + */ |
|
50 | + protected $tmp_sosa_table; |
|
51 | 51 | |
52 | - /** |
|
53 | - * Constructor for the Sosa Calculator |
|
54 | - * @param Tree $tree |
|
55 | - * @param User $user |
|
56 | - */ |
|
57 | - public function __construct(Tree $tree, User $user) { |
|
58 | - $this->tree = $tree; |
|
59 | - $this->user = $user; |
|
52 | + /** |
|
53 | + * Constructor for the Sosa Calculator |
|
54 | + * @param Tree $tree |
|
55 | + * @param User $user |
|
56 | + */ |
|
57 | + public function __construct(Tree $tree, User $user) { |
|
58 | + $this->tree = $tree; |
|
59 | + $this->user = $user; |
|
60 | 60 | |
61 | - $this->sosa_provider = new SosaProvider($this->tree, $this->user);; |
|
62 | - } |
|
61 | + $this->sosa_provider = new SosaProvider($this->tree, $this->user);; |
|
62 | + } |
|
63 | 63 | |
64 | - /** |
|
65 | - * Compute all Sosa ancestors from the user's root individual. |
|
66 | - * @return bool Result of the computation |
|
67 | - */ |
|
68 | - public function computeAll() { |
|
69 | - $root_id = $this->tree->getUserPreference($this->user, 'MAJ_SOSA_ROOT_ID'); |
|
70 | - $indi = Individual::getInstance($root_id, $this->tree); |
|
71 | - if($indi){ |
|
72 | - $this->sosa_provider->deleteAll(); |
|
73 | - $this->addNode($indi, 1); |
|
74 | - $this->flushTmpSosaTable(true); |
|
75 | - return true; |
|
76 | - } |
|
77 | - return false; |
|
78 | - } |
|
64 | + /** |
|
65 | + * Compute all Sosa ancestors from the user's root individual. |
|
66 | + * @return bool Result of the computation |
|
67 | + */ |
|
68 | + public function computeAll() { |
|
69 | + $root_id = $this->tree->getUserPreference($this->user, 'MAJ_SOSA_ROOT_ID'); |
|
70 | + $indi = Individual::getInstance($root_id, $this->tree); |
|
71 | + if($indi){ |
|
72 | + $this->sosa_provider->deleteAll(); |
|
73 | + $this->addNode($indi, 1); |
|
74 | + $this->flushTmpSosaTable(true); |
|
75 | + return true; |
|
76 | + } |
|
77 | + return false; |
|
78 | + } |
|
79 | 79 | |
80 | - /** |
|
81 | - * Compute all Sosa Ancestors from a specified Individual |
|
82 | - * @param Individual $indi |
|
83 | - * @return bool Result of the computation |
|
84 | - */ |
|
85 | - public function computeFromIndividual(Individual $indi) { |
|
86 | - $dindi = new \MyArtJaub\Webtrees\Individual($indi); |
|
87 | - $current_sosas = $dindi->getSosaNumbers(); |
|
88 | - foreach($current_sosas as $current_sosa => $gen) { |
|
89 | - $this->sosa_provider->deleteAncestors($current_sosa); |
|
90 | - $this->addNode($indi, $current_sosa); |
|
91 | - } |
|
92 | - $this->flushTmpSosaTable(true); |
|
93 | - return true; |
|
94 | - } |
|
80 | + /** |
|
81 | + * Compute all Sosa Ancestors from a specified Individual |
|
82 | + * @param Individual $indi |
|
83 | + * @return bool Result of the computation |
|
84 | + */ |
|
85 | + public function computeFromIndividual(Individual $indi) { |
|
86 | + $dindi = new \MyArtJaub\Webtrees\Individual($indi); |
|
87 | + $current_sosas = $dindi->getSosaNumbers(); |
|
88 | + foreach($current_sosas as $current_sosa => $gen) { |
|
89 | + $this->sosa_provider->deleteAncestors($current_sosa); |
|
90 | + $this->addNode($indi, $current_sosa); |
|
91 | + } |
|
92 | + $this->flushTmpSosaTable(true); |
|
93 | + return true; |
|
94 | + } |
|
95 | 95 | |
96 | - /** |
|
97 | - * Recursive method to add individual to the Sosa table, and flush it regularly |
|
98 | - * @param Individual $indi Individual to add |
|
99 | - * @param int $sosa Individual's sosa |
|
100 | - */ |
|
101 | - protected function addNode(Individual $indi, $sosa) { |
|
102 | - $birth_year = $indi->getEstimatedBirthDate()->gregorianYear(); |
|
103 | - $death_year = $indi->getEstimatedDeathDate()->gregorianYear(); |
|
96 | + /** |
|
97 | + * Recursive method to add individual to the Sosa table, and flush it regularly |
|
98 | + * @param Individual $indi Individual to add |
|
99 | + * @param int $sosa Individual's sosa |
|
100 | + */ |
|
101 | + protected function addNode(Individual $indi, $sosa) { |
|
102 | + $birth_year = $indi->getEstimatedBirthDate()->gregorianYear(); |
|
103 | + $death_year = $indi->getEstimatedDeathDate()->gregorianYear(); |
|
104 | 104 | |
105 | - $this->tmp_sosa_table[] = array( |
|
106 | - 'indi' => $indi->getXref(), |
|
107 | - 'sosa' => $sosa, |
|
108 | - 'birth_year' => $birth_year, |
|
109 | - 'death_year' => $death_year |
|
110 | - ); |
|
105 | + $this->tmp_sosa_table[] = array( |
|
106 | + 'indi' => $indi->getXref(), |
|
107 | + 'sosa' => $sosa, |
|
108 | + 'birth_year' => $birth_year, |
|
109 | + 'death_year' => $death_year |
|
110 | + ); |
|
111 | 111 | |
112 | - $this->flushTmpSosaTable(); |
|
112 | + $this->flushTmpSosaTable(); |
|
113 | 113 | |
114 | - if($fam = $indi->getPrimaryChildFamily()) { |
|
115 | - if($husb = $fam->getHusband()) $this->addNode($husb, 2 * $sosa); |
|
116 | - if($wife = $fam->getWife()) $this->addNode($wife, 2 * $sosa + 1); |
|
117 | - } |
|
118 | - } |
|
114 | + if($fam = $indi->getPrimaryChildFamily()) { |
|
115 | + if($husb = $fam->getHusband()) $this->addNode($husb, 2 * $sosa); |
|
116 | + if($wife = $fam->getWife()) $this->addNode($wife, 2 * $sosa + 1); |
|
117 | + } |
|
118 | + } |
|
119 | 119 | |
120 | - /** |
|
121 | - * Write sosas in the table, if the number of items is superior to the limit, or if forced. |
|
122 | - * |
|
123 | - * @param bool $force Should the flush be forced |
|
124 | - */ |
|
125 | - protected function flushTmpSosaTable($force = false) { |
|
126 | - if( count($this->tmp_sosa_table)> 0 && |
|
127 | - ($force || count($this->tmp_sosa_table) >= self::TMP_SOSA_TABLE_LIMIT)){ |
|
128 | - $this->sosa_provider->insertOrUpdate($this->tmp_sosa_table); |
|
129 | - $this->tmp_sosa_table = array(); |
|
130 | - } |
|
131 | - } |
|
120 | + /** |
|
121 | + * Write sosas in the table, if the number of items is superior to the limit, or if forced. |
|
122 | + * |
|
123 | + * @param bool $force Should the flush be forced |
|
124 | + */ |
|
125 | + protected function flushTmpSosaTable($force = false) { |
|
126 | + if( count($this->tmp_sosa_table)> 0 && |
|
127 | + ($force || count($this->tmp_sosa_table) >= self::TMP_SOSA_TABLE_LIMIT)){ |
|
128 | + $this->sosa_provider->insertOrUpdate($this->tmp_sosa_table); |
|
129 | + $this->tmp_sosa_table = array(); |
|
130 | + } |
|
131 | + } |
|
132 | 132 | |
133 | 133 | } |
134 | 134 | |
135 | 135 | \ No newline at end of file |
@@ -431,8 +431,7 @@ discard block |
||
431 | 431 | ) { |
432 | 432 | $birt_by_decade[(int)($birth_dates[0]->gregorianYear()/10)*10] .= $person->getSex(); |
433 | 433 | } |
434 | - } |
|
435 | - else { |
|
434 | + } else { |
|
436 | 435 | $birth_dates[0]=new Date(''); |
437 | 436 | } |
438 | 437 | if ($death_dates = $person->getAllDeathDates()) { |
@@ -443,8 +442,7 @@ discard block |
||
443 | 442 | ) { |
444 | 443 | $deat_by_decade[(int) ($death_dates[0]->gregorianYear() / 10) * 10] .= $person->getSex(); |
445 | 444 | } |
446 | - } |
|
447 | - else { |
|
445 | + } else { |
|
448 | 446 | $death_dates[0] = new Date(''); |
449 | 447 | } |
450 | 448 | $age = Date::getAge($birth_dates[0], $death_dates[0], 0); |
@@ -36,70 +36,70 @@ discard block |
||
36 | 36 | */ |
37 | 37 | class SosaListController extends MvcController |
38 | 38 | { |
39 | - /** |
|
40 | - * Sosa Provider for the controller |
|
41 | - * @var SosaProvider $sosa_provider |
|
42 | - */ |
|
43 | - protected $sosa_provider; |
|
39 | + /** |
|
40 | + * Sosa Provider for the controller |
|
41 | + * @var SosaProvider $sosa_provider |
|
42 | + */ |
|
43 | + protected $sosa_provider; |
|
44 | 44 | |
45 | - /** |
|
46 | - * Generation used for the controller |
|
47 | - * @var int $generation |
|
48 | - */ |
|
49 | - protected $generation; |
|
45 | + /** |
|
46 | + * Generation used for the controller |
|
47 | + * @var int $generation |
|
48 | + */ |
|
49 | + protected $generation; |
|
50 | 50 | |
51 | - /** |
|
52 | - * ViewBag to hold data for the controller |
|
53 | - * @var ViewBag $view_bag |
|
54 | - */ |
|
55 | - protected $view_bag; |
|
51 | + /** |
|
52 | + * ViewBag to hold data for the controller |
|
53 | + * @var ViewBag $view_bag |
|
54 | + */ |
|
55 | + protected $view_bag; |
|
56 | 56 | |
57 | - /** |
|
58 | - * {@inheritDoc} |
|
59 | - * @see \MyArtJaub\Webtrees\Mvc\Controller\MvcController::__construct(AbstractModule $module) |
|
60 | - */ |
|
61 | - public function __construct(AbstractModule $module) { |
|
62 | - global $WT_TREE; |
|
57 | + /** |
|
58 | + * {@inheritDoc} |
|
59 | + * @see \MyArtJaub\Webtrees\Mvc\Controller\MvcController::__construct(AbstractModule $module) |
|
60 | + */ |
|
61 | + public function __construct(AbstractModule $module) { |
|
62 | + global $WT_TREE; |
|
63 | 63 | |
64 | - parent::__construct($module); |
|
64 | + parent::__construct($module); |
|
65 | 65 | |
66 | - $this->sosa_provider = new SosaProvider($WT_TREE, Auth::user()); |
|
66 | + $this->sosa_provider = new SosaProvider($WT_TREE, Auth::user()); |
|
67 | 67 | |
68 | - $this->generation = Filter::getInteger('gen'); |
|
68 | + $this->generation = Filter::getInteger('gen'); |
|
69 | 69 | |
70 | - $this->view_bag = new ViewBag(); |
|
71 | - $this->view_bag->set('generation', $this->generation); |
|
72 | - $this->view_bag->set('max_gen', $this->sosa_provider->getLastGeneration()); |
|
73 | - $this->view_bag->set('is_setup', $this->sosa_provider->isSetup() && $this->view_bag->get('max_gen', 0)> 0); |
|
70 | + $this->view_bag = new ViewBag(); |
|
71 | + $this->view_bag->set('generation', $this->generation); |
|
72 | + $this->view_bag->set('max_gen', $this->sosa_provider->getLastGeneration()); |
|
73 | + $this->view_bag->set('is_setup', $this->sosa_provider->isSetup() && $this->view_bag->get('max_gen', 0)> 0); |
|
74 | 74 | |
75 | - } |
|
75 | + } |
|
76 | 76 | |
77 | 77 | |
78 | - /** |
|
79 | - * Pages |
|
80 | - */ |
|
78 | + /** |
|
79 | + * Pages |
|
80 | + */ |
|
81 | 81 | |
82 | - /** |
|
83 | - * SosaList@index |
|
84 | - */ |
|
85 | - public function index() { |
|
86 | - global $WT_TREE; |
|
82 | + /** |
|
83 | + * SosaList@index |
|
84 | + */ |
|
85 | + public function index() { |
|
86 | + global $WT_TREE; |
|
87 | 87 | |
88 | - $controller = new PageController(); |
|
89 | - $controller |
|
90 | - ->setPageTitle(I18N::translate('Sosa Ancestors')); |
|
88 | + $controller = new PageController(); |
|
89 | + $controller |
|
90 | + ->setPageTitle(I18N::translate('Sosa Ancestors')); |
|
91 | 91 | |
92 | - $this->view_bag->set('title', $controller->getPageTitle()); |
|
92 | + $this->view_bag->set('title', $controller->getPageTitle()); |
|
93 | 93 | |
94 | - if($this->view_bag->get('is_setup', false)) { |
|
95 | - $this->view_bag->set('has_sosa', $this->generation > 0 && $this->sosa_provider->getSosaCountAtGeneration($this->generation) > 0); |
|
96 | - $this->view_bag->set('url_module', $this->module->getName()); |
|
97 | - $this->view_bag->set('url_action', 'SosaList'); |
|
98 | - $this->view_bag->set('url_ged', $WT_TREE->getNameUrl()); |
|
99 | - $this->view_bag->set('min_gen', 1); |
|
94 | + if($this->view_bag->get('is_setup', false)) { |
|
95 | + $this->view_bag->set('has_sosa', $this->generation > 0 && $this->sosa_provider->getSosaCountAtGeneration($this->generation) > 0); |
|
96 | + $this->view_bag->set('url_module', $this->module->getName()); |
|
97 | + $this->view_bag->set('url_action', 'SosaList'); |
|
98 | + $this->view_bag->set('url_ged', $WT_TREE->getNameUrl()); |
|
99 | + $this->view_bag->set('min_gen', 1); |
|
100 | 100 | |
101 | - if($this->view_bag->get('has_sosa', false)) { |
|
102 | - $controller->addInlineJavascript(' |
|
101 | + if($this->view_bag->get('has_sosa', false)) { |
|
102 | + $controller->addInlineJavascript(' |
|
103 | 103 | jQuery("#sosalist-tabs").tabs(); |
104 | 104 | jQuery("#sosalist-tabs").css("visibility", "visible"); |
105 | 105 | |
@@ -153,44 +153,44 @@ discard block |
||
153 | 153 | ); |
154 | 154 | |
155 | 155 | '); |
156 | - } |
|
157 | - } |
|
156 | + } |
|
157 | + } |
|
158 | 158 | |
159 | - ViewFactory::make('SosaList', $this, $controller, $this->view_bag)->render(); |
|
160 | - } |
|
159 | + ViewFactory::make('SosaList', $this, $controller, $this->view_bag)->render(); |
|
160 | + } |
|
161 | 161 | |
162 | 162 | |
163 | - /** |
|
164 | - * SosaList@missing |
|
165 | - */ |
|
166 | - public function missing() { |
|
167 | - global $WT_TREE; |
|
163 | + /** |
|
164 | + * SosaList@missing |
|
165 | + */ |
|
166 | + public function missing() { |
|
167 | + global $WT_TREE; |
|
168 | 168 | |
169 | - $controller = new PageController(); |
|
170 | - $controller |
|
171 | - ->setPageTitle(I18N::translate('Missing Ancestors')); |
|
169 | + $controller = new PageController(); |
|
170 | + $controller |
|
171 | + ->setPageTitle(I18N::translate('Missing Ancestors')); |
|
172 | 172 | |
173 | - $this->view_bag->set('title', $controller->getPageTitle()); |
|
173 | + $this->view_bag->set('title', $controller->getPageTitle()); |
|
174 | 174 | |
175 | - if($this->view_bag->get('is_setup', false)) { |
|
176 | - $this->view_bag->set('url_module', $this->module->getName()); |
|
177 | - $this->view_bag->set('url_action', 'SosaList@missing'); |
|
178 | - $this->view_bag->set('url_ged', $WT_TREE->getNameUrl()); |
|
179 | - $this->view_bag->set('min_gen', 2); |
|
175 | + if($this->view_bag->get('is_setup', false)) { |
|
176 | + $this->view_bag->set('url_module', $this->module->getName()); |
|
177 | + $this->view_bag->set('url_action', 'SosaList@missing'); |
|
178 | + $this->view_bag->set('url_ged', $WT_TREE->getNameUrl()); |
|
179 | + $this->view_bag->set('min_gen', 2); |
|
180 | 180 | |
181 | - $missing_list = $this->sosa_provider->getMissingSosaListAtGeneration($this->generation); |
|
182 | - $this->view_bag->set('has_missing', $this->generation > 0 && count($missing_list) > 0); |
|
181 | + $missing_list = $this->sosa_provider->getMissingSosaListAtGeneration($this->generation); |
|
182 | + $this->view_bag->set('has_missing', $this->generation > 0 && count($missing_list) > 0); |
|
183 | 183 | |
184 | - $perc_sosa = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation), pow(2, $this->generation -1)); |
|
185 | - $this->view_bag->set('perc_sosa', $perc_sosa); |
|
184 | + $perc_sosa = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation), pow(2, $this->generation -1)); |
|
185 | + $this->view_bag->set('perc_sosa', $perc_sosa); |
|
186 | 186 | |
187 | - if($this->view_bag->get('has_missing', false)) { |
|
188 | - $table_id = 'table-sosa-missing-' . Uuid::uuid4(); |
|
189 | - $this->view_bag->set('table_id', $table_id); |
|
187 | + if($this->view_bag->get('has_missing', false)) { |
|
188 | + $table_id = 'table-sosa-missing-' . Uuid::uuid4(); |
|
189 | + $this->view_bag->set('table_id', $table_id); |
|
190 | 190 | |
191 | - $controller |
|
192 | - ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL) |
|
193 | - ->addInlineJavascript(' |
|
191 | + $controller |
|
192 | + ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL) |
|
193 | + ->addInlineJavascript(' |
|
194 | 194 | /* Initialise datatables */ |
195 | 195 | jQuery.fn.dataTableExt.oSort["unicode-asc" ]=function(a,b) {return a.replace(/<[^<]*>/, "").localeCompare(b.replace(/<[^<]*>/, ""))}; |
196 | 196 | jQuery.fn.dataTableExt.oSort["unicode-desc" ]=function(a,b) {return b.replace(/<[^<]*>/, "").localeCompare(a.replace(/<[^<]*>/, ""))}; |
@@ -250,77 +250,77 @@ discard block |
||
250 | 250 | jQuery(".loading-image").css("display", "none"); |
251 | 251 | '); |
252 | 252 | |
253 | - $unique_indis = array(); |
|
254 | - $sum_missing_different = 0; |
|
255 | - $sum_missing_different_without_hidden = 0; |
|
256 | - foreach($missing_list as $num => $missing_tab) { |
|
257 | - if(isset($unique_indis[$missing_tab['indi']])) { |
|
258 | - unset($missing_list[$num]); |
|
259 | - continue; |
|
260 | - } |
|
261 | - $sum_missing_different += !$missing_tab['has_father'] + !$missing_tab['has_mother']; |
|
262 | - $person = Individual::getInstance($missing_tab['indi'], $WT_TREE); |
|
263 | - if (!$person || !$person->canShowName()) { |
|
264 | - unset($missing_list[$num]); |
|
265 | - continue; |
|
266 | - } |
|
267 | - $sum_missing_different_without_hidden += !$missing_tab['has_father'] + !$missing_tab['has_mother']; |
|
268 | - $unique_indis[$person->getXref()] = true; |
|
269 | - $missing_tab['indi'] = $person; |
|
270 | - $missing_list[$num] = $missing_tab; |
|
271 | - } |
|
272 | - $this->view_bag->set('missing_list', $missing_list); |
|
273 | - $this->view_bag->set('missing_diff_count', $sum_missing_different); |
|
274 | - $this->view_bag->set('missing_hidden', $sum_missing_different - $sum_missing_different_without_hidden); |
|
275 | - $perc_sosa_potential = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation - 1), pow(2, $this->generation-2)); |
|
276 | - $this->view_bag->set('perc_sosa_potential', $perc_sosa_potential); |
|
277 | - } |
|
278 | - } |
|
253 | + $unique_indis = array(); |
|
254 | + $sum_missing_different = 0; |
|
255 | + $sum_missing_different_without_hidden = 0; |
|
256 | + foreach($missing_list as $num => $missing_tab) { |
|
257 | + if(isset($unique_indis[$missing_tab['indi']])) { |
|
258 | + unset($missing_list[$num]); |
|
259 | + continue; |
|
260 | + } |
|
261 | + $sum_missing_different += !$missing_tab['has_father'] + !$missing_tab['has_mother']; |
|
262 | + $person = Individual::getInstance($missing_tab['indi'], $WT_TREE); |
|
263 | + if (!$person || !$person->canShowName()) { |
|
264 | + unset($missing_list[$num]); |
|
265 | + continue; |
|
266 | + } |
|
267 | + $sum_missing_different_without_hidden += !$missing_tab['has_father'] + !$missing_tab['has_mother']; |
|
268 | + $unique_indis[$person->getXref()] = true; |
|
269 | + $missing_tab['indi'] = $person; |
|
270 | + $missing_list[$num] = $missing_tab; |
|
271 | + } |
|
272 | + $this->view_bag->set('missing_list', $missing_list); |
|
273 | + $this->view_bag->set('missing_diff_count', $sum_missing_different); |
|
274 | + $this->view_bag->set('missing_hidden', $sum_missing_different - $sum_missing_different_without_hidden); |
|
275 | + $perc_sosa_potential = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation - 1), pow(2, $this->generation-2)); |
|
276 | + $this->view_bag->set('perc_sosa_potential', $perc_sosa_potential); |
|
277 | + } |
|
278 | + } |
|
279 | 279 | |
280 | - ViewFactory::make('SosaListMissing', $this, $controller, $this->view_bag)->render(); |
|
281 | - } |
|
280 | + ViewFactory::make('SosaListMissing', $this, $controller, $this->view_bag)->render(); |
|
281 | + } |
|
282 | 282 | |
283 | - /** |
|
284 | - * SosaList@sosalist |
|
285 | - */ |
|
286 | - public function sosalist() { |
|
283 | + /** |
|
284 | + * SosaList@sosalist |
|
285 | + */ |
|
286 | + public function sosalist() { |
|
287 | 287 | |
288 | - $type = Filter::get('type', 'indi|fam', null); |
|
288 | + $type = Filter::get('type', 'indi|fam', null); |
|
289 | 289 | |
290 | - $controller = new AjaxController(); |
|
291 | - $controller->restrictAccess($this->generation > 0 || !is_null($type)); |
|
290 | + $controller = new AjaxController(); |
|
291 | + $controller->restrictAccess($this->generation > 0 || !is_null($type)); |
|
292 | 292 | |
293 | - switch ($type){ |
|
294 | - case 'indi': |
|
295 | - $this->renderSosaListIndi($controller); |
|
296 | - break; |
|
297 | - case 'fam': |
|
298 | - $this->renderFamSosaListIndi($controller); |
|
299 | - break; |
|
300 | - default: |
|
301 | - break; |
|
302 | - } |
|
293 | + switch ($type){ |
|
294 | + case 'indi': |
|
295 | + $this->renderSosaListIndi($controller); |
|
296 | + break; |
|
297 | + case 'fam': |
|
298 | + $this->renderFamSosaListIndi($controller); |
|
299 | + break; |
|
300 | + default: |
|
301 | + break; |
|
302 | + } |
|
303 | 303 | |
304 | - } |
|
304 | + } |
|
305 | 305 | |
306 | - /** |
|
307 | - * Render the Ajax response for the sortable table of Sosa individuals |
|
308 | - * @param AjaxController $controller |
|
309 | - */ |
|
310 | - protected function renderSosaListIndi(AjaxController $controller) { |
|
311 | - global $WT_TREE; |
|
306 | + /** |
|
307 | + * Render the Ajax response for the sortable table of Sosa individuals |
|
308 | + * @param AjaxController $controller |
|
309 | + */ |
|
310 | + protected function renderSosaListIndi(AjaxController $controller) { |
|
311 | + global $WT_TREE; |
|
312 | 312 | |
313 | - $listSosa = $this->sosa_provider->getSosaListAtGeneration($this->generation); |
|
314 | - $this->view_bag->set('has_sosa', false); |
|
313 | + $listSosa = $this->sosa_provider->getSosaListAtGeneration($this->generation); |
|
314 | + $this->view_bag->set('has_sosa', false); |
|
315 | 315 | |
316 | - if(count($listSosa) > 0) { |
|
317 | - $this->view_bag->set('has_sosa', true); |
|
318 | - $table_id = 'table-sosa-indi-' . Uuid::uuid4(); |
|
319 | - $this->view_bag->set('table_id', $table_id); |
|
316 | + if(count($listSosa) > 0) { |
|
317 | + $this->view_bag->set('has_sosa', true); |
|
318 | + $table_id = 'table-sosa-indi-' . Uuid::uuid4(); |
|
319 | + $this->view_bag->set('table_id', $table_id); |
|
320 | 320 | |
321 | - $controller |
|
322 | - ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL) |
|
323 | - ->addInlineJavascript(' |
|
321 | + $controller |
|
322 | + ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL) |
|
323 | + ->addInlineJavascript(' |
|
324 | 324 | jQuery.fn.dataTableExt.oSort["unicode-asc" ]=function(a,b) {return a.replace(/<[^<]*>/, "").localeCompare(b.replace(/<[^<]*>/, ""))}; |
325 | 325 | jQuery.fn.dataTableExt.oSort["unicode-desc" ]=function(a,b) {return b.replace(/<[^<]*>/, "").localeCompare(a.replace(/<[^<]*>/, ""))}; |
326 | 326 | jQuery.fn.dataTableExt.oSort["num-html-asc" ]=function(a,b) {a=parseFloat(a.replace(/<[^<]*>/, "")); b=parseFloat(b.replace(/<[^<]*>/, "")); return (a<b) ? -1 : (a>b ? 1 : 0);}; |
@@ -396,96 +396,96 @@ discard block |
||
396 | 396 | jQuery("#btn-toggle-statistics-'.$table_id.'").click(); |
397 | 397 | '); |
398 | 398 | |
399 | - $stats = new Stats($WT_TREE); |
|
399 | + $stats = new Stats($WT_TREE); |
|
400 | 400 | |
401 | - // Bad data can cause "longest life" to be huge, blowing memory limits |
|
402 | - $max_age = min($WT_TREE->getPreference('MAX_ALIVE_AGE'), $stats->LongestLifeAge()) + 1; |
|
403 | - // Inititialise chart data |
|
404 | - $deat_by_age = array(); |
|
405 | - for ($age = 0; $age <= $max_age; $age++) { |
|
406 | - $deat_by_age[$age] = ''; |
|
407 | - } |
|
408 | - $birt_by_decade = array(); |
|
409 | - $deat_by_decade = array(); |
|
410 | - for ($year = 1550; $year < 2030; $year += 10) { |
|
411 | - $birt_by_decade[$year] = ''; |
|
412 | - $deat_by_decade[$year] = ''; |
|
413 | - } |
|
401 | + // Bad data can cause "longest life" to be huge, blowing memory limits |
|
402 | + $max_age = min($WT_TREE->getPreference('MAX_ALIVE_AGE'), $stats->LongestLifeAge()) + 1; |
|
403 | + // Inititialise chart data |
|
404 | + $deat_by_age = array(); |
|
405 | + for ($age = 0; $age <= $max_age; $age++) { |
|
406 | + $deat_by_age[$age] = ''; |
|
407 | + } |
|
408 | + $birt_by_decade = array(); |
|
409 | + $deat_by_decade = array(); |
|
410 | + for ($year = 1550; $year < 2030; $year += 10) { |
|
411 | + $birt_by_decade[$year] = ''; |
|
412 | + $deat_by_decade[$year] = ''; |
|
413 | + } |
|
414 | 414 | |
415 | - $unique_indis = array(); // Don't double-count indis with multiple names. |
|
416 | - $nb_displayed = 0; |
|
415 | + $unique_indis = array(); // Don't double-count indis with multiple names. |
|
416 | + $nb_displayed = 0; |
|
417 | 417 | |
418 | - Individual::load($WT_TREE, $listSosa); |
|
419 | - foreach($listSosa as $sosa => $pid) { |
|
420 | - $person = Individual::getInstance($pid, $WT_TREE); |
|
421 | - if (!$person || !$person->canShowName()) { |
|
422 | - unset($listSosa[$sosa]); |
|
423 | - continue; |
|
424 | - } |
|
425 | - $nb_displayed++; |
|
426 | - if ($birth_dates=$person->getAllBirthDates()) { |
|
427 | - if ( |
|
428 | - FunctionsPrint::isDateWithinChartsRange($birth_dates[0]) && |
|
429 | - !isset($unique_indis[$person->getXref()]) |
|
430 | - ) { |
|
431 | - $birt_by_decade[(int)($birth_dates[0]->gregorianYear()/10)*10] .= $person->getSex(); |
|
432 | - } |
|
433 | - } |
|
434 | - else { |
|
435 | - $birth_dates[0]=new Date(''); |
|
436 | - } |
|
437 | - if ($death_dates = $person->getAllDeathDates()) { |
|
438 | - if ( |
|
439 | - FunctionsPrint::isDateWithinChartsRange($death_dates[0]) && |
|
440 | - !isset($unique_indis[$person->getXref()]) |
|
441 | - ) { |
|
442 | - $deat_by_decade[(int) ($death_dates[0]->gregorianYear() / 10) * 10] .= $person->getSex(); |
|
443 | - } |
|
444 | - } |
|
445 | - else { |
|
446 | - $death_dates[0] = new Date(''); |
|
447 | - } |
|
448 | - $age = Date::getAge($birth_dates[0], $death_dates[0], 0); |
|
449 | - if (!isset($unique_indis[$person->getXref()]) && $age >= 0 && $age <= $max_age) { |
|
450 | - $deat_by_age[$age] .= $person->getSex(); |
|
451 | - } |
|
452 | - $listSosa[$sosa] = $person; |
|
453 | - $unique_indis[$person->getXref()] = true; |
|
454 | - } |
|
455 | - $this->view_bag->set('sosa_list', $listSosa); |
|
418 | + Individual::load($WT_TREE, $listSosa); |
|
419 | + foreach($listSosa as $sosa => $pid) { |
|
420 | + $person = Individual::getInstance($pid, $WT_TREE); |
|
421 | + if (!$person || !$person->canShowName()) { |
|
422 | + unset($listSosa[$sosa]); |
|
423 | + continue; |
|
424 | + } |
|
425 | + $nb_displayed++; |
|
426 | + if ($birth_dates=$person->getAllBirthDates()) { |
|
427 | + if ( |
|
428 | + FunctionsPrint::isDateWithinChartsRange($birth_dates[0]) && |
|
429 | + !isset($unique_indis[$person->getXref()]) |
|
430 | + ) { |
|
431 | + $birt_by_decade[(int)($birth_dates[0]->gregorianYear()/10)*10] .= $person->getSex(); |
|
432 | + } |
|
433 | + } |
|
434 | + else { |
|
435 | + $birth_dates[0]=new Date(''); |
|
436 | + } |
|
437 | + if ($death_dates = $person->getAllDeathDates()) { |
|
438 | + if ( |
|
439 | + FunctionsPrint::isDateWithinChartsRange($death_dates[0]) && |
|
440 | + !isset($unique_indis[$person->getXref()]) |
|
441 | + ) { |
|
442 | + $deat_by_decade[(int) ($death_dates[0]->gregorianYear() / 10) * 10] .= $person->getSex(); |
|
443 | + } |
|
444 | + } |
|
445 | + else { |
|
446 | + $death_dates[0] = new Date(''); |
|
447 | + } |
|
448 | + $age = Date::getAge($birth_dates[0], $death_dates[0], 0); |
|
449 | + if (!isset($unique_indis[$person->getXref()]) && $age >= 0 && $age <= $max_age) { |
|
450 | + $deat_by_age[$age] .= $person->getSex(); |
|
451 | + } |
|
452 | + $listSosa[$sosa] = $person; |
|
453 | + $unique_indis[$person->getXref()] = true; |
|
454 | + } |
|
455 | + $this->view_bag->set('sosa_list', $listSosa); |
|
456 | 456 | |
457 | - $this->view_bag->set('sosa_count', count($listSosa)); |
|
458 | - $this->view_bag->set('sosa_theo', pow(2, $this->generation-1)); |
|
459 | - $this->view_bag->set('sosa_ratio', Functions::safeDivision($this->view_bag->get('sosa_count'), $this->view_bag->get('sosa_theo'))); |
|
457 | + $this->view_bag->set('sosa_count', count($listSosa)); |
|
458 | + $this->view_bag->set('sosa_theo', pow(2, $this->generation-1)); |
|
459 | + $this->view_bag->set('sosa_ratio', Functions::safeDivision($this->view_bag->get('sosa_count'), $this->view_bag->get('sosa_theo'))); |
|
460 | 460 | |
461 | - $this->view_bag->set('sosa_hidden', $this->view_bag->get('sosa_count') - $nb_displayed); |
|
461 | + $this->view_bag->set('sosa_hidden', $this->view_bag->get('sosa_count') - $nb_displayed); |
|
462 | 462 | |
463 | - $this->view_bag->set('chart_births', FunctionsPrintLists::chartByDecade($birt_by_decade, I18N::translate('Decade of birth'))); |
|
464 | - $this->view_bag->set('chart_deaths', FunctionsPrintLists::chartByDecade($deat_by_decade, I18N::translate('Decade of death'))); |
|
465 | - $this->view_bag->set('chart_ages', FunctionsPrintLists::chartByAge($deat_by_age, I18N::translate('Age related to death year'))); |
|
466 | - } |
|
463 | + $this->view_bag->set('chart_births', FunctionsPrintLists::chartByDecade($birt_by_decade, I18N::translate('Decade of birth'))); |
|
464 | + $this->view_bag->set('chart_deaths', FunctionsPrintLists::chartByDecade($deat_by_decade, I18N::translate('Decade of death'))); |
|
465 | + $this->view_bag->set('chart_ages', FunctionsPrintLists::chartByAge($deat_by_age, I18N::translate('Age related to death year'))); |
|
466 | + } |
|
467 | 467 | |
468 | - ViewFactory::make('SosaListIndi', $this, $controller, $this->view_bag)->render(); |
|
469 | - } |
|
468 | + ViewFactory::make('SosaListIndi', $this, $controller, $this->view_bag)->render(); |
|
469 | + } |
|
470 | 470 | |
471 | - /** |
|
472 | - * Render the Ajax response for the sortable table of Sosa family |
|
473 | - * @param AjaxController $controller |
|
474 | - */ |
|
475 | - protected function renderFamSosaListIndi(AjaxController $controller) { |
|
476 | - global $WT_TREE; |
|
471 | + /** |
|
472 | + * Render the Ajax response for the sortable table of Sosa family |
|
473 | + * @param AjaxController $controller |
|
474 | + */ |
|
475 | + protected function renderFamSosaListIndi(AjaxController $controller) { |
|
476 | + global $WT_TREE; |
|
477 | 477 | |
478 | - $listFamSosa = $this->sosa_provider->getFamilySosaListAtGeneration($this->generation);; |
|
479 | - $this->view_bag->set('has_sosa', false); |
|
478 | + $listFamSosa = $this->sosa_provider->getFamilySosaListAtGeneration($this->generation);; |
|
479 | + $this->view_bag->set('has_sosa', false); |
|
480 | 480 | |
481 | - if(count($listFamSosa) > 0) { |
|
482 | - $this->view_bag->set('has_sosa', true); |
|
483 | - $table_id = 'table-sosa-fam-' . Uuid::uuid4(); |
|
484 | - $this->view_bag->set('table_id', $table_id); |
|
481 | + if(count($listFamSosa) > 0) { |
|
482 | + $this->view_bag->set('has_sosa', true); |
|
483 | + $table_id = 'table-sosa-fam-' . Uuid::uuid4(); |
|
484 | + $this->view_bag->set('table_id', $table_id); |
|
485 | 485 | |
486 | - $controller |
|
487 | - ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL) |
|
488 | - ->addInlineJavascript(' |
|
486 | + $controller |
|
487 | + ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL) |
|
488 | + ->addInlineJavascript(' |
|
489 | 489 | jQuery.fn.dataTableExt.oSort["unicode-asc" ]=function(a,b) {return a.replace(/<[^<]*>/, "").localeCompare(b.replace(/<[^<]*>/, ""))}; |
490 | 490 | jQuery.fn.dataTableExt.oSort["unicode-desc" ]=function(a,b) {return b.replace(/<[^<]*>/, "").localeCompare(a.replace(/<[^<]*>/, ""))}; |
491 | 491 | jQuery.fn.dataTableExt.oSort["num-html-asc" ]=function(a,b) {a=parseFloat(a.replace(/<[^<]*>/, "")); b=parseFloat(b.replace(/<[^<]*>/, "")); return (a<b) ? -1 : (a>b ? 1 : 0);}; |
@@ -561,67 +561,67 @@ discard block |
||
561 | 561 | jQuery("#btn-toggle-statistics-'.$table_id.'").click(); |
562 | 562 | '); |
563 | 563 | |
564 | - $stats = new Stats($WT_TREE); |
|
565 | - $max_age = max($stats->oldestMarriageMaleAge(), $stats->oldestMarriageFemaleAge()) + 1; |
|
564 | + $stats = new Stats($WT_TREE); |
|
565 | + $max_age = max($stats->oldestMarriageMaleAge(), $stats->oldestMarriageFemaleAge()) + 1; |
|
566 | 566 | |
567 | - //-- init chart data |
|
568 | - $marr_by_age = array(); |
|
569 | - for ($age=0; $age<=$max_age; $age++) { |
|
570 | - $marr_by_age[$age] = ''; |
|
571 | - } |
|
572 | - $birt_by_decade = array(); |
|
573 | - $marr_by_decade = array(); |
|
574 | - for ($year=1550; $year<2030; $year+=10) { |
|
575 | - $birt_by_decade[$year] = ''; |
|
576 | - $marr_by_decade[$year] = ''; |
|
577 | - } |
|
567 | + //-- init chart data |
|
568 | + $marr_by_age = array(); |
|
569 | + for ($age=0; $age<=$max_age; $age++) { |
|
570 | + $marr_by_age[$age] = ''; |
|
571 | + } |
|
572 | + $birt_by_decade = array(); |
|
573 | + $marr_by_decade = array(); |
|
574 | + for ($year=1550; $year<2030; $year+=10) { |
|
575 | + $birt_by_decade[$year] = ''; |
|
576 | + $marr_by_decade[$year] = ''; |
|
577 | + } |
|
578 | 578 | |
579 | - foreach($listFamSosa as $sosa => $fid) { |
|
580 | - $sfamily = Family::getInstance($fid, $WT_TREE); |
|
581 | - if(!$sfamily || !$sfamily->canShow()) { |
|
582 | - unset($sfamily[$sosa]); |
|
583 | - continue; |
|
584 | - } |
|
585 | - $mdate=$sfamily->getMarriageDate(); |
|
579 | + foreach($listFamSosa as $sosa => $fid) { |
|
580 | + $sfamily = Family::getInstance($fid, $WT_TREE); |
|
581 | + if(!$sfamily || !$sfamily->canShow()) { |
|
582 | + unset($sfamily[$sosa]); |
|
583 | + continue; |
|
584 | + } |
|
585 | + $mdate=$sfamily->getMarriageDate(); |
|
586 | 586 | |
587 | - if( ($husb = $sfamily->getHusband()) && |
|
588 | - ($hdate = $husb->getBirthDate()) && |
|
589 | - $hdate->isOK() && $mdate->isOK()) { |
|
590 | - if (FunctionsPrint::isDateWithinChartsRange($hdate)) { |
|
591 | - $birt_by_decade[(int) ($hdate->gregorianYear() / 10) * 10] .= $husb->getSex(); |
|
592 | - } |
|
593 | - $hage = Date::getAge($hdate, $mdate, 0); |
|
594 | - if ($hage >= 0 && $hage <= $max_age) { |
|
595 | - $marr_by_age[$hage] .= $husb->getSex(); |
|
596 | - } |
|
597 | - } |
|
587 | + if( ($husb = $sfamily->getHusband()) && |
|
588 | + ($hdate = $husb->getBirthDate()) && |
|
589 | + $hdate->isOK() && $mdate->isOK()) { |
|
590 | + if (FunctionsPrint::isDateWithinChartsRange($hdate)) { |
|
591 | + $birt_by_decade[(int) ($hdate->gregorianYear() / 10) * 10] .= $husb->getSex(); |
|
592 | + } |
|
593 | + $hage = Date::getAge($hdate, $mdate, 0); |
|
594 | + if ($hage >= 0 && $hage <= $max_age) { |
|
595 | + $marr_by_age[$hage] .= $husb->getSex(); |
|
596 | + } |
|
597 | + } |
|
598 | 598 | |
599 | - if(($wife = $sfamily->getWife()) && |
|
600 | - ($wdate=$wife->getBirthDate()) && |
|
601 | - $wdate->isOK() && $mdate->isOK()) { |
|
602 | - if (FunctionsPrint::isDateWithinChartsRange($wdate)) { |
|
603 | - $birt_by_decade[(int) ($wdate->gregorianYear() / 10) * 10] .= $wife->getSex(); |
|
604 | - } |
|
605 | - $wage = Date::getAge($wdate, $mdate, 0); |
|
606 | - if ($wage >= 0 && $wage <= $max_age) { |
|
607 | - $marr_by_age[$wage] .= $wife->getSex(); |
|
608 | - } |
|
609 | - } |
|
599 | + if(($wife = $sfamily->getWife()) && |
|
600 | + ($wdate=$wife->getBirthDate()) && |
|
601 | + $wdate->isOK() && $mdate->isOK()) { |
|
602 | + if (FunctionsPrint::isDateWithinChartsRange($wdate)) { |
|
603 | + $birt_by_decade[(int) ($wdate->gregorianYear() / 10) * 10] .= $wife->getSex(); |
|
604 | + } |
|
605 | + $wage = Date::getAge($wdate, $mdate, 0); |
|
606 | + if ($wage >= 0 && $wage <= $max_age) { |
|
607 | + $marr_by_age[$wage] .= $wife->getSex(); |
|
608 | + } |
|
609 | + } |
|
610 | 610 | |
611 | - if ($mdate->isOK() && FunctionsPrint::isDateWithinChartsRange($mdate) && $husb && $wife) { |
|
612 | - $marr_by_decade[(int) ($mdate->gregorianYear() / 10) * 10] .= $husb->getSex() . $wife->getSex(); |
|
613 | - } |
|
611 | + if ($mdate->isOK() && FunctionsPrint::isDateWithinChartsRange($mdate) && $husb && $wife) { |
|
612 | + $marr_by_decade[(int) ($mdate->gregorianYear() / 10) * 10] .= $husb->getSex() . $wife->getSex(); |
|
613 | + } |
|
614 | 614 | |
615 | - $listFamSosa[$sosa] = $sfamily; |
|
616 | - } |
|
617 | - $this->view_bag->set('sosa_list', $listFamSosa); |
|
615 | + $listFamSosa[$sosa] = $sfamily; |
|
616 | + } |
|
617 | + $this->view_bag->set('sosa_list', $listFamSosa); |
|
618 | 618 | |
619 | - $this->view_bag->set('chart_births', FunctionsPrintLists::chartByDecade($birt_by_decade, I18N::translate('Decade of birth'))); |
|
620 | - $this->view_bag->set('chart_marriages', FunctionsPrintLists::chartByDecade($marr_by_decade, I18N::translate('Decade of marriage'))); |
|
621 | - $this->view_bag->set('chart_ages', FunctionsPrintLists::chartByAge($marr_by_age, I18N::translate('Age in year of marriage'))); |
|
622 | - } |
|
619 | + $this->view_bag->set('chart_births', FunctionsPrintLists::chartByDecade($birt_by_decade, I18N::translate('Decade of birth'))); |
|
620 | + $this->view_bag->set('chart_marriages', FunctionsPrintLists::chartByDecade($marr_by_decade, I18N::translate('Decade of marriage'))); |
|
621 | + $this->view_bag->set('chart_ages', FunctionsPrintLists::chartByAge($marr_by_age, I18N::translate('Age in year of marriage'))); |
|
622 | + } |
|
623 | 623 | |
624 | - ViewFactory::make('SosaListFam', $this, $controller, $this->view_bag)->render(); |
|
625 | - } |
|
624 | + ViewFactory::make('SosaListFam', $this, $controller, $this->view_bag)->render(); |
|
625 | + } |
|
626 | 626 | |
627 | 627 | } |
628 | 628 | \ No newline at end of file |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | $this->view_bag = new ViewBag(); |
71 | 71 | $this->view_bag->set('generation', $this->generation); |
72 | 72 | $this->view_bag->set('max_gen', $this->sosa_provider->getLastGeneration()); |
73 | - $this->view_bag->set('is_setup', $this->sosa_provider->isSetup() && $this->view_bag->get('max_gen', 0)> 0); |
|
73 | + $this->view_bag->set('is_setup', $this->sosa_provider->isSetup() && $this->view_bag->get('max_gen', 0) > 0); |
|
74 | 74 | |
75 | 75 | } |
76 | 76 | |
@@ -91,14 +91,14 @@ discard block |
||
91 | 91 | |
92 | 92 | $this->view_bag->set('title', $controller->getPageTitle()); |
93 | 93 | |
94 | - if($this->view_bag->get('is_setup', false)) { |
|
94 | + if ($this->view_bag->get('is_setup', false)) { |
|
95 | 95 | $this->view_bag->set('has_sosa', $this->generation > 0 && $this->sosa_provider->getSosaCountAtGeneration($this->generation) > 0); |
96 | 96 | $this->view_bag->set('url_module', $this->module->getName()); |
97 | 97 | $this->view_bag->set('url_action', 'SosaList'); |
98 | 98 | $this->view_bag->set('url_ged', $WT_TREE->getNameUrl()); |
99 | 99 | $this->view_bag->set('min_gen', 1); |
100 | 100 | |
101 | - if($this->view_bag->get('has_sosa', false)) { |
|
101 | + if ($this->view_bag->get('has_sosa', false)) { |
|
102 | 102 | $controller->addInlineJavascript(' |
103 | 103 | jQuery("#sosalist-tabs").tabs(); |
104 | 104 | jQuery("#sosalist-tabs").css("visibility", "visible"); |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | { |
109 | 109 | "mod" : "'.$this->module->getName().'", |
110 | 110 | "mod_action": "SosaList@sosalist", |
111 | - "ged" : "' . $WT_TREE->getNameUrl(). '", |
|
111 | + "ged" : "' . $WT_TREE->getNameUrl().'", |
|
112 | 112 | "type" : "indi", |
113 | 113 | "gen" : "'.$this->generation.'" |
114 | 114 | }, |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | { |
134 | 134 | "mod" : "'.$this->module->getName().'", |
135 | 135 | "mod_action": "SosaList@sosalist", |
136 | - "ged" : "' . $WT_TREE->getNameUrl(). '", |
|
136 | + "ged" : "' . $WT_TREE->getNameUrl().'", |
|
137 | 137 | "type" : "fam", |
138 | 138 | "gen" : "'.$this->generation.'" |
139 | 139 | }, |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | |
173 | 173 | $this->view_bag->set('title', $controller->getPageTitle()); |
174 | 174 | |
175 | - if($this->view_bag->get('is_setup', false)) { |
|
175 | + if ($this->view_bag->get('is_setup', false)) { |
|
176 | 176 | $this->view_bag->set('url_module', $this->module->getName()); |
177 | 177 | $this->view_bag->set('url_action', 'SosaList@missing'); |
178 | 178 | $this->view_bag->set('url_ged', $WT_TREE->getNameUrl()); |
@@ -181,11 +181,11 @@ discard block |
||
181 | 181 | $missing_list = $this->sosa_provider->getMissingSosaListAtGeneration($this->generation); |
182 | 182 | $this->view_bag->set('has_missing', $this->generation > 0 && count($missing_list) > 0); |
183 | 183 | |
184 | - $perc_sosa = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation), pow(2, $this->generation -1)); |
|
184 | + $perc_sosa = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation), pow(2, $this->generation - 1)); |
|
185 | 185 | $this->view_bag->set('perc_sosa', $perc_sosa); |
186 | 186 | |
187 | - if($this->view_bag->get('has_missing', false)) { |
|
188 | - $table_id = 'table-sosa-missing-' . Uuid::uuid4(); |
|
187 | + if ($this->view_bag->get('has_missing', false)) { |
|
188 | + $table_id = 'table-sosa-missing-'.Uuid::uuid4(); |
|
189 | 189 | $this->view_bag->set('table_id', $table_id); |
190 | 190 | |
191 | 191 | $controller |
@@ -198,7 +198,7 @@ discard block |
||
198 | 198 | jQuery.fn.dataTableExt.oSort["num-html-desc"]=function(a,b) {a=parseFloat(a.replace(/<[^<]*>/, "")); b=parseFloat(b.replace(/<[^<]*>/, "")); return (a>b) ? -1 : (a<b ? 1 : 0);}; |
199 | 199 | |
200 | 200 | jQuery("#'.$table_id.'").dataTable( { |
201 | - dom: \'<"H"<"filtersH_' . $table_id . '">T<"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_' . $table_id . '">>\', |
|
201 | + dom: \'<"H"<"filtersH_' . $table_id.'">T<"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_'.$table_id.'">>\', |
|
202 | 202 | '.I18N::datatablesI18N().', |
203 | 203 | jQueryUI: true, |
204 | 204 | autoWidth:false, |
@@ -229,14 +229,14 @@ discard block |
||
229 | 229 | pagingType: "full_numbers" |
230 | 230 | }); |
231 | 231 | |
232 | - jQuery("#' . $table_id . '") |
|
232 | + jQuery("#' . $table_id.'") |
|
233 | 233 | /* Filter buttons in table header */ |
234 | 234 | .on("click", "button[data-filter-column]", function() { |
235 | 235 | var btn = jQuery(this); |
236 | 236 | // De-activate the other buttons in this button group |
237 | 237 | btn.siblings().removeClass("ui-state-active"); |
238 | 238 | // Apply (or clear) this filter |
239 | - var col = jQuery("#' . $table_id . '").DataTable().column(btn.data("filter-column")); |
|
239 | + var col = jQuery("#' . $table_id.'").DataTable().column(btn.data("filter-column")); |
|
240 | 240 | if (btn.hasClass("ui-state-active")) { |
241 | 241 | btn.removeClass("ui-state-active"); |
242 | 242 | col.search("").draw(); |
@@ -253,8 +253,8 @@ discard block |
||
253 | 253 | $unique_indis = array(); |
254 | 254 | $sum_missing_different = 0; |
255 | 255 | $sum_missing_different_without_hidden = 0; |
256 | - foreach($missing_list as $num => $missing_tab) { |
|
257 | - if(isset($unique_indis[$missing_tab['indi']])) { |
|
256 | + foreach ($missing_list as $num => $missing_tab) { |
|
257 | + if (isset($unique_indis[$missing_tab['indi']])) { |
|
258 | 258 | unset($missing_list[$num]); |
259 | 259 | continue; |
260 | 260 | } |
@@ -272,7 +272,7 @@ discard block |
||
272 | 272 | $this->view_bag->set('missing_list', $missing_list); |
273 | 273 | $this->view_bag->set('missing_diff_count', $sum_missing_different); |
274 | 274 | $this->view_bag->set('missing_hidden', $sum_missing_different - $sum_missing_different_without_hidden); |
275 | - $perc_sosa_potential = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation - 1), pow(2, $this->generation-2)); |
|
275 | + $perc_sosa_potential = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation - 1), pow(2, $this->generation - 2)); |
|
276 | 276 | $this->view_bag->set('perc_sosa_potential', $perc_sosa_potential); |
277 | 277 | } |
278 | 278 | } |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | $controller = new AjaxController(); |
291 | 291 | $controller->restrictAccess($this->generation > 0 || !is_null($type)); |
292 | 292 | |
293 | - switch ($type){ |
|
293 | + switch ($type) { |
|
294 | 294 | case 'indi': |
295 | 295 | $this->renderSosaListIndi($controller); |
296 | 296 | break; |
@@ -313,9 +313,9 @@ discard block |
||
313 | 313 | $listSosa = $this->sosa_provider->getSosaListAtGeneration($this->generation); |
314 | 314 | $this->view_bag->set('has_sosa', false); |
315 | 315 | |
316 | - if(count($listSosa) > 0) { |
|
316 | + if (count($listSosa) > 0) { |
|
317 | 317 | $this->view_bag->set('has_sosa', true); |
318 | - $table_id = 'table-sosa-indi-' . Uuid::uuid4(); |
|
318 | + $table_id = 'table-sosa-indi-'.Uuid::uuid4(); |
|
319 | 319 | $this->view_bag->set('table_id', $table_id); |
320 | 320 | |
321 | 321 | $controller |
@@ -327,8 +327,8 @@ discard block |
||
327 | 327 | jQuery.fn.dataTableExt.oSort["num-html-desc"]=function(a,b) {a=parseFloat(a.replace(/<[^<]*>/, "")); b=parseFloat(b.replace(/<[^<]*>/, "")); return (a>b) ? -1 : (a<b ? 1 : 0);}; |
328 | 328 | |
329 | 329 | jQuery("#'.$table_id.'").dataTable( { |
330 | - dom: \'<"H"<"filtersH_' . $table_id . '">T<"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_' . $table_id . '">>\', |
|
331 | - ' . I18N::datatablesI18N() . ', |
|
330 | + dom: \'<"H"<"filtersH_' . $table_id.'">T<"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_'.$table_id.'">>\', |
|
331 | + ' . I18N::datatablesI18N().', |
|
332 | 332 | jQueryUI: true, |
333 | 333 | autoWidth: false, |
334 | 334 | processing: true, |
@@ -364,7 +364,7 @@ discard block |
||
364 | 364 | pagingType: "full_numbers" |
365 | 365 | }); |
366 | 366 | |
367 | - jQuery("#' . $table_id . '") |
|
367 | + jQuery("#' . $table_id.'") |
|
368 | 368 | /* Hide/show parents */ |
369 | 369 | .on("click", ".btn-toggle-parents", function() { |
370 | 370 | jQuery(this).toggleClass("ui-state-active"); |
@@ -373,7 +373,7 @@ discard block |
||
373 | 373 | /* Hide/show statistics */ |
374 | 374 | .on("click", ".btn-toggle-statistics", function() { |
375 | 375 | jQuery(this).toggleClass("ui-state-active"); |
376 | - jQuery("#indi_list_table-charts_' . $table_id . '").slideToggle(); |
|
376 | + jQuery("#indi_list_table-charts_' . $table_id.'").slideToggle(); |
|
377 | 377 | }) |
378 | 378 | /* Filter buttons in table header */ |
379 | 379 | .on("click", "button[data-filter-column]", function() { |
@@ -381,7 +381,7 @@ discard block |
||
381 | 381 | // De-activate the other buttons in this button group |
382 | 382 | btn.siblings().removeClass("ui-state-active"); |
383 | 383 | // Apply (or clear) this filter |
384 | - var col = jQuery("#' . $table_id . '").DataTable().column(btn.data("filter-column")); |
|
384 | + var col = jQuery("#' . $table_id.'").DataTable().column(btn.data("filter-column")); |
|
385 | 385 | if (btn.hasClass("ui-state-active")) { |
386 | 386 | btn.removeClass("ui-state-active"); |
387 | 387 | col.search("").draw(); |
@@ -416,30 +416,30 @@ discard block |
||
416 | 416 | $nb_displayed = 0; |
417 | 417 | |
418 | 418 | Individual::load($WT_TREE, $listSosa); |
419 | - foreach($listSosa as $sosa => $pid) { |
|
419 | + foreach ($listSosa as $sosa => $pid) { |
|
420 | 420 | $person = Individual::getInstance($pid, $WT_TREE); |
421 | 421 | if (!$person || !$person->canShowName()) { |
422 | 422 | unset($listSosa[$sosa]); |
423 | 423 | continue; |
424 | 424 | } |
425 | 425 | $nb_displayed++; |
426 | - if ($birth_dates=$person->getAllBirthDates()) { |
|
426 | + if ($birth_dates = $person->getAllBirthDates()) { |
|
427 | 427 | if ( |
428 | 428 | FunctionsPrint::isDateWithinChartsRange($birth_dates[0]) && |
429 | 429 | !isset($unique_indis[$person->getXref()]) |
430 | 430 | ) { |
431 | - $birt_by_decade[(int)($birth_dates[0]->gregorianYear()/10)*10] .= $person->getSex(); |
|
431 | + $birt_by_decade[(int)($birth_dates[0]->gregorianYear() / 10) * 10] .= $person->getSex(); |
|
432 | 432 | } |
433 | 433 | } |
434 | 434 | else { |
435 | - $birth_dates[0]=new Date(''); |
|
435 | + $birth_dates[0] = new Date(''); |
|
436 | 436 | } |
437 | 437 | if ($death_dates = $person->getAllDeathDates()) { |
438 | 438 | if ( |
439 | 439 | FunctionsPrint::isDateWithinChartsRange($death_dates[0]) && |
440 | 440 | !isset($unique_indis[$person->getXref()]) |
441 | 441 | ) { |
442 | - $deat_by_decade[(int) ($death_dates[0]->gregorianYear() / 10) * 10] .= $person->getSex(); |
|
442 | + $deat_by_decade[(int)($death_dates[0]->gregorianYear() / 10) * 10] .= $person->getSex(); |
|
443 | 443 | } |
444 | 444 | } |
445 | 445 | else { |
@@ -455,7 +455,7 @@ discard block |
||
455 | 455 | $this->view_bag->set('sosa_list', $listSosa); |
456 | 456 | |
457 | 457 | $this->view_bag->set('sosa_count', count($listSosa)); |
458 | - $this->view_bag->set('sosa_theo', pow(2, $this->generation-1)); |
|
458 | + $this->view_bag->set('sosa_theo', pow(2, $this->generation - 1)); |
|
459 | 459 | $this->view_bag->set('sosa_ratio', Functions::safeDivision($this->view_bag->get('sosa_count'), $this->view_bag->get('sosa_theo'))); |
460 | 460 | |
461 | 461 | $this->view_bag->set('sosa_hidden', $this->view_bag->get('sosa_count') - $nb_displayed); |
@@ -475,12 +475,12 @@ discard block |
||
475 | 475 | protected function renderFamSosaListIndi(AjaxController $controller) { |
476 | 476 | global $WT_TREE; |
477 | 477 | |
478 | - $listFamSosa = $this->sosa_provider->getFamilySosaListAtGeneration($this->generation);; |
|
478 | + $listFamSosa = $this->sosa_provider->getFamilySosaListAtGeneration($this->generation); ; |
|
479 | 479 | $this->view_bag->set('has_sosa', false); |
480 | 480 | |
481 | - if(count($listFamSosa) > 0) { |
|
481 | + if (count($listFamSosa) > 0) { |
|
482 | 482 | $this->view_bag->set('has_sosa', true); |
483 | - $table_id = 'table-sosa-fam-' . Uuid::uuid4(); |
|
483 | + $table_id = 'table-sosa-fam-'.Uuid::uuid4(); |
|
484 | 484 | $this->view_bag->set('table_id', $table_id); |
485 | 485 | |
486 | 486 | $controller |
@@ -492,7 +492,7 @@ discard block |
||
492 | 492 | jQuery.fn.dataTableExt.oSort["num-html-desc"]=function(a,b) {a=parseFloat(a.replace(/<[^<]*>/, "")); b=parseFloat(b.replace(/<[^<]*>/, "")); return (a>b) ? -1 : (a<b ? 1 : 0);}; |
493 | 493 | |
494 | 494 | jQuery("#'.$table_id.'").dataTable( { |
495 | - dom: \'<"H"<"filtersH_' . $table_id . '"><"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_' . $table_id . '">>\', |
|
495 | + dom: \'<"H"<"filtersH_' . $table_id.'"><"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_'.$table_id.'">>\', |
|
496 | 496 | '.I18N::datatablesI18N(array(16, 32, 64, 128, -1)).', |
497 | 497 | jQueryUI: true, |
498 | 498 | autoWidth: false, |
@@ -529,7 +529,7 @@ discard block |
||
529 | 529 | pagingType: "full_numbers" |
530 | 530 | }); |
531 | 531 | |
532 | - jQuery("#' . $table_id . '") |
|
532 | + jQuery("#' . $table_id.'") |
|
533 | 533 | /* Hide/show parents */ |
534 | 534 | .on("click", ".btn-toggle-parents", function() { |
535 | 535 | jQuery(this).toggleClass("ui-state-active"); |
@@ -538,7 +538,7 @@ discard block |
||
538 | 538 | /* Hide/show statistics */ |
539 | 539 | .on("click", ".btn-toggle-statistics", function() { |
540 | 540 | jQuery(this).toggleClass("ui-state-active"); |
541 | - jQuery("#fam_list_table-charts_' . $table_id . '").slideToggle(); |
|
541 | + jQuery("#fam_list_table-charts_' . $table_id.'").slideToggle(); |
|
542 | 542 | }) |
543 | 543 | /* Filter buttons in table header */ |
544 | 544 | .on("click", "button[data-filter-column]", function() { |
@@ -546,7 +546,7 @@ discard block |
||
546 | 546 | // De-activate the other buttons in this button group |
547 | 547 | btn.siblings().removeClass("ui-state-active"); |
548 | 548 | // Apply (or clear) this filter |
549 | - var col = jQuery("#' . $table_id . '").DataTable().column(btn.data("filter-column")); |
|
549 | + var col = jQuery("#' . $table_id.'").DataTable().column(btn.data("filter-column")); |
|
550 | 550 | if (btn.hasClass("ui-state-active")) { |
551 | 551 | btn.removeClass("ui-state-active"); |
552 | 552 | col.search("").draw(); |
@@ -566,29 +566,29 @@ discard block |
||
566 | 566 | |
567 | 567 | //-- init chart data |
568 | 568 | $marr_by_age = array(); |
569 | - for ($age=0; $age<=$max_age; $age++) { |
|
569 | + for ($age = 0; $age <= $max_age; $age++) { |
|
570 | 570 | $marr_by_age[$age] = ''; |
571 | 571 | } |
572 | 572 | $birt_by_decade = array(); |
573 | 573 | $marr_by_decade = array(); |
574 | - for ($year=1550; $year<2030; $year+=10) { |
|
574 | + for ($year = 1550; $year < 2030; $year += 10) { |
|
575 | 575 | $birt_by_decade[$year] = ''; |
576 | 576 | $marr_by_decade[$year] = ''; |
577 | 577 | } |
578 | 578 | |
579 | - foreach($listFamSosa as $sosa => $fid) { |
|
579 | + foreach ($listFamSosa as $sosa => $fid) { |
|
580 | 580 | $sfamily = Family::getInstance($fid, $WT_TREE); |
581 | - if(!$sfamily || !$sfamily->canShow()) { |
|
581 | + if (!$sfamily || !$sfamily->canShow()) { |
|
582 | 582 | unset($sfamily[$sosa]); |
583 | 583 | continue; |
584 | 584 | } |
585 | - $mdate=$sfamily->getMarriageDate(); |
|
585 | + $mdate = $sfamily->getMarriageDate(); |
|
586 | 586 | |
587 | - if( ($husb = $sfamily->getHusband()) && |
|
587 | + if (($husb = $sfamily->getHusband()) && |
|
588 | 588 | ($hdate = $husb->getBirthDate()) && |
589 | 589 | $hdate->isOK() && $mdate->isOK()) { |
590 | 590 | if (FunctionsPrint::isDateWithinChartsRange($hdate)) { |
591 | - $birt_by_decade[(int) ($hdate->gregorianYear() / 10) * 10] .= $husb->getSex(); |
|
591 | + $birt_by_decade[(int)($hdate->gregorianYear() / 10) * 10] .= $husb->getSex(); |
|
592 | 592 | } |
593 | 593 | $hage = Date::getAge($hdate, $mdate, 0); |
594 | 594 | if ($hage >= 0 && $hage <= $max_age) { |
@@ -596,11 +596,11 @@ discard block |
||
596 | 596 | } |
597 | 597 | } |
598 | 598 | |
599 | - if(($wife = $sfamily->getWife()) && |
|
600 | - ($wdate=$wife->getBirthDate()) && |
|
599 | + if (($wife = $sfamily->getWife()) && |
|
600 | + ($wdate = $wife->getBirthDate()) && |
|
601 | 601 | $wdate->isOK() && $mdate->isOK()) { |
602 | 602 | if (FunctionsPrint::isDateWithinChartsRange($wdate)) { |
603 | - $birt_by_decade[(int) ($wdate->gregorianYear() / 10) * 10] .= $wife->getSex(); |
|
603 | + $birt_by_decade[(int)($wdate->gregorianYear() / 10) * 10] .= $wife->getSex(); |
|
604 | 604 | } |
605 | 605 | $wage = Date::getAge($wdate, $mdate, 0); |
606 | 606 | if ($wage >= 0 && $wage <= $max_age) { |
@@ -609,7 +609,7 @@ discard block |
||
609 | 609 | } |
610 | 610 | |
611 | 611 | if ($mdate->isOK() && FunctionsPrint::isDateWithinChartsRange($mdate) && $husb && $wife) { |
612 | - $marr_by_decade[(int) ($mdate->gregorianYear() / 10) * 10] .= $husb->getSex() . $wife->getSex(); |
|
612 | + $marr_by_decade[(int)($mdate->gregorianYear() / 10) * 10] .= $husb->getSex().$wife->getSex(); |
|
613 | 613 | } |
614 | 614 | |
615 | 615 | $listFamSosa[$sosa] = $sfamily; |
@@ -22,18 +22,18 @@ |
||
22 | 22 | public function upgrade() { |
23 | 23 | |
24 | 24 | Database::exec( |
25 | - 'CREATE TABLE IF NOT EXISTS `##maj_sosa` (' . |
|
26 | - ' majs_gedcom_id INTEGER NOT NULL,' . |
|
27 | - ' majs_user_id INTEGER NOT NULL DEFAULT -1,' . |
|
28 | - ' majs_sosa BIGINT UNSIGNED NOT NULL,' . // Allow to calculate sosa on 64 generations |
|
29 | - ' majs_i_id VARCHAR(20) NOT NULL,' . |
|
30 | - ' majs_gen TINYINT NULL,' . |
|
31 | - ' majs_birth_year SMALLINT NULL,' . |
|
32 | - ' majs_death_year SMALLINT NULL,' . |
|
33 | - ' PRIMARY KEY (majs_gedcom_id, majs_user_id, majs_sosa),' . |
|
34 | - ' FOREIGN KEY `##gedcom_id_fk1` (majs_gedcom_id) REFERENCES `##gedcom` (gedcom_id) ON DELETE CASCADE,' . |
|
35 | - ' FOREIGN KEY `##user_id_fk1` (majs_user_id) REFERENCES `##user` (user_id) ON DELETE CASCADE' . |
|
36 | - ') COLLATE utf8_unicode_ci ENGINE=InnoDB' |
|
25 | + 'CREATE TABLE IF NOT EXISTS `##maj_sosa` (' . |
|
26 | + ' majs_gedcom_id INTEGER NOT NULL,' . |
|
27 | + ' majs_user_id INTEGER NOT NULL DEFAULT -1,' . |
|
28 | + ' majs_sosa BIGINT UNSIGNED NOT NULL,' . // Allow to calculate sosa on 64 generations |
|
29 | + ' majs_i_id VARCHAR(20) NOT NULL,' . |
|
30 | + ' majs_gen TINYINT NULL,' . |
|
31 | + ' majs_birth_year SMALLINT NULL,' . |
|
32 | + ' majs_death_year SMALLINT NULL,' . |
|
33 | + ' PRIMARY KEY (majs_gedcom_id, majs_user_id, majs_sosa),' . |
|
34 | + ' FOREIGN KEY `##gedcom_id_fk1` (majs_gedcom_id) REFERENCES `##gedcom` (gedcom_id) ON DELETE CASCADE,' . |
|
35 | + ' FOREIGN KEY `##user_id_fk1` (majs_user_id) REFERENCES `##user` (user_id) ON DELETE CASCADE' . |
|
36 | + ') COLLATE utf8_unicode_ci ENGINE=InnoDB' |
|
37 | 37 | ); |
38 | 38 | } |
39 | 39 | } |
@@ -22,17 +22,17 @@ |
||
22 | 22 | public function upgrade() { |
23 | 23 | |
24 | 24 | Database::exec( |
25 | - 'CREATE TABLE IF NOT EXISTS `##maj_sosa` (' . |
|
26 | - ' majs_gedcom_id INTEGER NOT NULL,' . |
|
27 | - ' majs_user_id INTEGER NOT NULL DEFAULT -1,' . |
|
28 | - ' majs_sosa BIGINT UNSIGNED NOT NULL,' . // Allow to calculate sosa on 64 generations |
|
29 | - ' majs_i_id VARCHAR(20) NOT NULL,' . |
|
30 | - ' majs_gen TINYINT NULL,' . |
|
31 | - ' majs_birth_year SMALLINT NULL,' . |
|
32 | - ' majs_death_year SMALLINT NULL,' . |
|
33 | - ' PRIMARY KEY (majs_gedcom_id, majs_user_id, majs_sosa),' . |
|
34 | - ' FOREIGN KEY `##gedcom_id_fk1` (majs_gedcom_id) REFERENCES `##gedcom` (gedcom_id) ON DELETE CASCADE,' . |
|
35 | - ' FOREIGN KEY `##user_id_fk1` (majs_user_id) REFERENCES `##user` (user_id) ON DELETE CASCADE' . |
|
25 | + 'CREATE TABLE IF NOT EXISTS `##maj_sosa` ('. |
|
26 | + ' majs_gedcom_id INTEGER NOT NULL,'. |
|
27 | + ' majs_user_id INTEGER NOT NULL DEFAULT -1,'. |
|
28 | + ' majs_sosa BIGINT UNSIGNED NOT NULL,'.// Allow to calculate sosa on 64 generations |
|
29 | + ' majs_i_id VARCHAR(20) NOT NULL,'. |
|
30 | + ' majs_gen TINYINT NULL,'. |
|
31 | + ' majs_birth_year SMALLINT NULL,'. |
|
32 | + ' majs_death_year SMALLINT NULL,'. |
|
33 | + ' PRIMARY KEY (majs_gedcom_id, majs_user_id, majs_sosa),'. |
|
34 | + ' FOREIGN KEY `##gedcom_id_fk1` (majs_gedcom_id) REFERENCES `##gedcom` (gedcom_id) ON DELETE CASCADE,'. |
|
35 | + ' FOREIGN KEY `##user_id_fk1` (majs_user_id) REFERENCES `##user` (user_id) ON DELETE CASCADE'. |
|
36 | 36 | ') COLLATE utf8_unicode_ci ENGINE=InnoDB' |
37 | 37 | ); |
38 | 38 | } |
@@ -23,17 +23,17 @@ discard block |
||
23 | 23 | * {@inhericDoc} |
24 | 24 | * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent() |
25 | 25 | */ |
26 | - protected function renderContent() { |
|
27 | - ?> |
|
26 | + protected function renderContent() { |
|
27 | + ?> |
|
28 | 28 | <div id="maj-sosa-list-page" class="center"> |
29 | 29 | <h2><?php echo $this->data->get('title'); ?></h2> |
30 | 30 | |
31 | 31 | <?php if($this->data->get('is_setup')) { |
32 | - $selectedgen = $this->data->get('generation'); |
|
33 | - $this->renderSosaHeader(); |
|
34 | - if($this->data->get('has_sosa') ) { |
|
35 | - if($selectedgen > 0) { |
|
36 | - ?> |
|
32 | + $selectedgen = $this->data->get('generation'); |
|
33 | + $this->renderSosaHeader(); |
|
34 | + if($this->data->get('has_sosa') ) { |
|
35 | + if($selectedgen > 0) { |
|
36 | + ?> |
|
37 | 37 | <div id="sosalist-tabs"> |
38 | 38 | <ul> |
39 | 39 | <li><a href="#sosalist-indi"><?php echo I18N::translate('Individuals'); ?></a></li> |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | <?php } else { ?> |
54 | 54 | <p class="warning"><?php echo I18N::translate('No ancestor has been found for generation %d', $selectedgen); ?></p> |
55 | 55 | <?php } |
56 | - } |
|
56 | + } |
|
57 | 57 | } else { ?> |
58 | 58 | <p class="warning"><?php echo I18N::translate('The list could not be displayed. Reasons might be:'); ?><br/> |
59 | 59 | <ul> |
@@ -64,15 +64,15 @@ discard block |
||
64 | 64 | <?php } ?> |
65 | 65 | </div> |
66 | 66 | <?php |
67 | - } |
|
67 | + } |
|
68 | 68 | |
69 | - /** |
|
70 | - * Render the common header to Sosa Lists, made of the generation selector, and the generation navigator |
|
71 | - */ |
|
72 | - protected function renderSosaHeader() { |
|
73 | - $selectedgen = $this->data->get('generation'); |
|
74 | - $max_gen = $this->data->get('max_gen'); |
|
75 | - ?> |
|
69 | + /** |
|
70 | + * Render the common header to Sosa Lists, made of the generation selector, and the generation navigator |
|
71 | + */ |
|
72 | + protected function renderSosaHeader() { |
|
73 | + $selectedgen = $this->data->get('generation'); |
|
74 | + $max_gen = $this->data->get('max_gen'); |
|
75 | + ?> |
|
76 | 76 | |
77 | 77 | <form method="get" name="setgen" action="module.php"> |
78 | 78 | <input type="hidden" name="mod" value="<?php echo $this->data->get('url_module');?>"> |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | |
118 | 118 | <?php |
119 | 119 | } |
120 | - } |
|
120 | + } |
|
121 | 121 | |
122 | 122 | } |
123 | 123 | |
124 | 124 | \ No newline at end of file |
@@ -28,11 +28,11 @@ discard block |
||
28 | 28 | <div id="maj-sosa-list-page" class="center"> |
29 | 29 | <h2><?php echo $this->data->get('title'); ?></h2> |
30 | 30 | |
31 | - <?php if($this->data->get('is_setup')) { |
|
31 | + <?php if ($this->data->get('is_setup')) { |
|
32 | 32 | $selectedgen = $this->data->get('generation'); |
33 | 33 | $this->renderSosaHeader(); |
34 | - if($this->data->get('has_sosa') ) { |
|
35 | - if($selectedgen > 0) { |
|
34 | + if ($this->data->get('has_sosa')) { |
|
35 | + if ($selectedgen > 0) { |
|
36 | 36 | ?> |
37 | 37 | <div id="sosalist-tabs"> |
38 | 38 | <ul> |
@@ -75,9 +75,9 @@ discard block |
||
75 | 75 | ?> |
76 | 76 | |
77 | 77 | <form method="get" name="setgen" action="module.php"> |
78 | - <input type="hidden" name="mod" value="<?php echo $this->data->get('url_module');?>"> |
|
79 | - <input type="hidden" name="mod_action" value="<?php echo $this->data->get('url_action');?>"> |
|
80 | - <input type="hidden" name="ged" value="<?php echo $this->data->get('url_ged');?>"> |
|
78 | + <input type="hidden" name="mod" value="<?php echo $this->data->get('url_module'); ?>"> |
|
79 | + <input type="hidden" name="mod_action" value="<?php echo $this->data->get('url_action'); ?>"> |
|
80 | + <input type="hidden" name="ged" value="<?php echo $this->data->get('url_ged'); ?>"> |
|
81 | 81 | <div class="maj-table"> |
82 | 82 | <div class="maj-row"> |
83 | 83 | <div class="label"><?php echo I18N::translate('Choose generation') ?></div> |
@@ -85,9 +85,9 @@ discard block |
||
85 | 85 | <div class="maj-row"> |
86 | 86 | <div class="value"> |
87 | 87 | <select name="gen"> |
88 | - <?php for($i=$this->data->get('min_gen'); $i <= $max_gen;$i++) {?> |
|
88 | + <?php for ($i = $this->data->get('min_gen'); $i <= $max_gen; $i++) {?> |
|
89 | 89 | <option value="<?php echo $i; ?>" |
90 | - <?php if($selectedgen && $selectedgen==$i) { ?> selected="true" <?php } ?> |
|
90 | + <?php if ($selectedgen && $selectedgen == $i) { ?> selected="true" <?php } ?> |
|
91 | 91 | ><?php echo I18N::translate('Generation %d', $i); ?> |
92 | 92 | </option> |
93 | 93 | <?php } ?> |
@@ -95,21 +95,21 @@ discard block |
||
95 | 95 | </div> |
96 | 96 | </div> |
97 | 97 | </div> |
98 | - <input type="submit" value="<?php echo I18N::translate('Show');?>" /> |
|
98 | + <input type="submit" value="<?php echo I18N::translate('Show'); ?>" /> |
|
99 | 99 | <br /> |
100 | 100 | </form> |
101 | - <?php if($selectedgen > 0) { ?> |
|
101 | + <?php if ($selectedgen > 0) { ?> |
|
102 | 102 | <h4> |
103 | - <?php if($selectedgen > $this->data->get('min_gen')) { ?> |
|
104 | - <a href="module.php?mod=<?php echo $this->data->get('url_module');?>&mod_action=<?php echo $this->data->get('url_action');?>&ged=<?php echo $this->data->get('url_ged');?>&gen=<?php echo $selectedgen-1; ?>"> |
|
103 | + <?php if ($selectedgen > $this->data->get('min_gen')) { ?> |
|
104 | + <a href="module.php?mod=<?php echo $this->data->get('url_module'); ?>&mod_action=<?php echo $this->data->get('url_action'); ?>&ged=<?php echo $this->data->get('url_ged'); ?>&gen=<?php echo $selectedgen - 1; ?>"> |
|
105 | 105 | <i class="icon-ldarrow" title="<?php echo I18N::translate('Previous generation'); ?>" ></i> |
106 | 106 | </a> |
107 | 107 | |
108 | 108 | <?php } ?> |
109 | 109 | <?php echo I18N::translate('Generation %d', $selectedgen); ?> |
110 | - <?php if($selectedgen < $max_gen) { ?> |
|
110 | + <?php if ($selectedgen < $max_gen) { ?> |
|
111 | 111 | |
112 | - <a href="module.php?mod=<?php echo $this->data->get('url_module');?>&mod_action=<?php echo $this->data->get('url_action');?>&ged=<?php echo $this->data->get('url_ged');?>&gen=<?php echo $selectedgen+1; ?>"> |
|
112 | + <a href="module.php?mod=<?php echo $this->data->get('url_module'); ?>&mod_action=<?php echo $this->data->get('url_action'); ?>&ged=<?php echo $this->data->get('url_ged'); ?>&gen=<?php echo $selectedgen + 1; ?>"> |
|
113 | 113 | <i class="icon-rdarrow" title="<?php echo I18N::translate('Next generation'); ?>" ></i> |
114 | 114 | </a> |
115 | 115 | <?php } ?> |
@@ -25,9 +25,9 @@ discard block |
||
25 | 25 | * {@inhericDoc} |
26 | 26 | * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent() |
27 | 27 | */ |
28 | - protected function renderContent() { |
|
28 | + protected function renderContent() { |
|
29 | 29 | |
30 | - ?> |
|
30 | + ?> |
|
31 | 31 | |
32 | 32 | <div id="maj-sosa-config-page"> |
33 | 33 | <h2><?php echo $this->data->get('title'); ?></h2> |
@@ -47,9 +47,9 @@ discard block |
||
47 | 47 | </div> |
48 | 48 | <div class="value"> |
49 | 49 | <?php |
50 | - $users = $this->data->get('users_settings'); |
|
51 | - if(count($users) == 1) { |
|
52 | - ?> |
|
50 | + $users = $this->data->get('users_settings'); |
|
51 | + if(count($users) == 1) { |
|
52 | + ?> |
|
53 | 53 | <label> |
54 | 54 | <input id="maj_sosa_input_userid" type="hidden" name="userid" value="<?php echo $users[0]['user']->getUserId(); ?>" /> |
55 | 55 | <?php echo $users[0]['user']->getRealNameHtml() ?> |
@@ -57,8 +57,8 @@ discard block |
||
57 | 57 | <?php } else if(count($users) > 1) { ?> |
58 | 58 | <select id='maj-sosa-config-select' name="userid"> |
59 | 59 | <?php |
60 | - $root_indi = $users[0]['rootid']; |
|
61 | - foreach ($this->data->get('users_settings') as $user) { ?> |
|
60 | + $root_indi = $users[0]['rootid']; |
|
61 | + foreach ($this->data->get('users_settings') as $user) { ?> |
|
62 | 62 | <option value="<?php echo $user['user']->getUserId(); ?>"><?php echo $user['user']->getRealNameHtml() ?></option> |
63 | 63 | <?php } ?> |
64 | 64 | </select> |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | </form> |
82 | 82 | |
83 | 83 | <?php |
84 | - } |
|
84 | + } |
|
85 | 85 | |
86 | 86 | } |
87 | 87 | |
88 | 88 | \ No newline at end of file |
@@ -48,13 +48,13 @@ |
||
48 | 48 | <div class="value"> |
49 | 49 | <?php |
50 | 50 | $users = $this->data->get('users_settings'); |
51 | - if(count($users) == 1) { |
|
51 | + if (count($users) == 1) { |
|
52 | 52 | ?> |
53 | 53 | <label> |
54 | 54 | <input id="maj_sosa_input_userid" type="hidden" name="userid" value="<?php echo $users[0]['user']->getUserId(); ?>" /> |
55 | 55 | <?php echo $users[0]['user']->getRealNameHtml() ?> |
56 | 56 | </label> |
57 | - <?php } else if(count($users) > 1) { ?> |
|
57 | + <?php } else if (count($users) > 1) { ?> |
|
58 | 58 | <select id='maj-sosa-config-select' name="userid"> |
59 | 59 | <?php |
60 | 60 | $root_indi = $users[0]['rootid']; |
@@ -31,11 +31,11 @@ discard block |
||
31 | 31 | * {@inhericDoc} |
32 | 32 | * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent() |
33 | 33 | */ |
34 | - protected function renderContent() { |
|
34 | + protected function renderContent() { |
|
35 | 35 | |
36 | - if($this->data->get('has_sosa', false)) { |
|
37 | - $table_id = $this->data->get('table_id'); |
|
38 | - ?> |
|
36 | + if($this->data->get('has_sosa', false)) { |
|
37 | + $table_id = $this->data->get('table_id'); |
|
38 | + ?> |
|
39 | 39 | |
40 | 40 | <div id="sosa-indi-list" class="sosa-list"> |
41 | 41 | <table id="<?php echo $table_id;?>"> |
@@ -186,42 +186,42 @@ discard block |
||
186 | 186 | <tbody> |
187 | 187 | |
188 | 188 | <?php foreach($this->data->get('sosa_list') as $sosa => $person) { |
189 | - /** @var \Fisharebest\Webtrees\Individual $person */ |
|
190 | - if ($person->isPendingAddtion()) { |
|
191 | - $class = ' class="new"'; |
|
192 | - } elseif ($person->isPendingDeletion()) { |
|
193 | - $class = ' class="old"'; |
|
194 | - } else { |
|
195 | - $class = ''; |
|
196 | - } |
|
197 | - $dperson = new \MyArtJaub\Webtrees\Individual($person); |
|
198 | - ?> |
|
189 | + /** @var \Fisharebest\Webtrees\Individual $person */ |
|
190 | + if ($person->isPendingAddtion()) { |
|
191 | + $class = ' class="new"'; |
|
192 | + } elseif ($person->isPendingDeletion()) { |
|
193 | + $class = ' class="old"'; |
|
194 | + } else { |
|
195 | + $class = ''; |
|
196 | + } |
|
197 | + $dperson = new \MyArtJaub\Webtrees\Individual($person); |
|
198 | + ?> |
|
199 | 199 | <tr <?php echo $class?>> |
200 | 200 | <td class="transparent"><?php echo $sosa; ?></td> |
201 | 201 | <td class="transparent"><?php echo $person->getXref(); ?></td> |
202 | 202 | <td colspan="2"> |
203 | 203 | <?php foreach ($person->getAllNames() as $num=>$name) { |
204 | - if ($name['type']=='NAME') { |
|
205 | - $title=''; |
|
206 | - } else { |
|
207 | - $title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"'; |
|
208 | - } |
|
209 | - if ($num==$person->getPrimaryName()) { |
|
210 | - $class=' class="name2"'; |
|
211 | - $sex_image=$person->getSexImage(); |
|
212 | - list($surn, $givn)=explode(',', $name['sort']); |
|
213 | - } else { |
|
214 | - $class=''; |
|
215 | - $sex_image=''; |
|
216 | - } ?> |
|
204 | + if ($name['type']=='NAME') { |
|
205 | + $title=''; |
|
206 | + } else { |
|
207 | + $title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"'; |
|
208 | + } |
|
209 | + if ($num==$person->getPrimaryName()) { |
|
210 | + $class=' class="name2"'; |
|
211 | + $sex_image=$person->getSexImage(); |
|
212 | + list($surn, $givn)=explode(',', $name['sort']); |
|
213 | + } else { |
|
214 | + $class=''; |
|
215 | + $sex_image=''; |
|
216 | + } ?> |
|
217 | 217 | <a <?php echo $title.' '.$class; ?> href="<?php echo $person->getHtmlUrl(); ?>"> |
218 | 218 | <?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']); ?> |
219 | 219 | </a> |
220 | 220 | <?php echo $sex_image.FunctionsPrint::formatSosaNumbers($dperson->getSosaNumbers(), 1, 'smaller'); ?> |
221 | 221 | <br/> |
222 | 222 | <?php } |
223 | - echo $person->getPrimaryParentsNames('parents details1', 'none'); |
|
224 | - ?> |
|
223 | + echo $person->getPrimaryParentsNames('parents details1', 'none'); |
|
224 | + ?> |
|
225 | 225 | </td> |
226 | 226 | <td style="display:none;"></td> |
227 | 227 | <td> |
@@ -232,34 +232,34 @@ discard block |
||
232 | 232 | </td> |
233 | 233 | <td> |
234 | 234 | <?php |
235 | - if ($birth_dates=$person->getAllBirthDates()) { |
|
236 | - foreach ($birth_dates as $num=>$birth_date) { |
|
237 | - if ($num) { ?><br/><?php } ?> |
|
235 | + if ($birth_dates=$person->getAllBirthDates()) { |
|
236 | + foreach ($birth_dates as $num=>$birth_date) { |
|
237 | + if ($num) { ?><br/><?php } ?> |
|
238 | 238 | <?php echo $birth_date->display(true); |
239 | - } |
|
240 | - } else { |
|
241 | - $birth_date=$person->getEstimatedBirthDate(); |
|
242 | - if ($person->getTree()->getPreference('SHOW_EST_LIST_DATES')) { |
|
243 | - $birth_date->display(true); |
|
244 | - } else { |
|
245 | - echo ' '; |
|
246 | - } |
|
247 | - $birth_dates[0] = new Date(''); |
|
248 | - } |
|
249 | - ?> |
|
239 | + } |
|
240 | + } else { |
|
241 | + $birth_date=$person->getEstimatedBirthDate(); |
|
242 | + if ($person->getTree()->getPreference('SHOW_EST_LIST_DATES')) { |
|
243 | + $birth_date->display(true); |
|
244 | + } else { |
|
245 | + echo ' '; |
|
246 | + } |
|
247 | + $birth_dates[0] = new Date(''); |
|
248 | + } |
|
249 | + ?> |
|
250 | 250 | </td> |
251 | 251 | <td><?php echo $birth_date->julianDay();?></td> |
252 | 252 | <td> |
253 | 253 | <?php foreach ($person->getAllBirthPlaces() as $n => $birth_place) { |
254 | - $tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree()); |
|
255 | - if ($n) { ?><br><?php } ?> |
|
254 | + $tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree()); |
|
255 | + if ($n) { ?><br><?php } ?> |
|
256 | 256 | <a href="'<?php echo $tmp->getURL(); ?>" title="<?php echo strip_tags($tmp->getFullName()); ?>"> |
257 | 257 | <?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($tmp->getShortName()); ?> |
258 | 258 | </a> |
259 | 259 | <?php } ?> |
260 | 260 | </td> |
261 | 261 | <?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) { |
262 | - $isBSourced = $dperson->isBirthSourced(); ?> |
|
262 | + $isBSourced = $dperson->isBirthSourced(); ?> |
|
263 | 263 | <td><?php echo FunctionsPrint::formatIsSourcedIcon('E', $isBSourced, 'BIRT', 1, 'medium'); ?></td> |
264 | 264 | <td><?php echo $isBSourced; ?></td> |
265 | 265 | <?php } else { ?> |
@@ -269,36 +269,36 @@ discard block |
||
269 | 269 | <td> |
270 | 270 | <?php |
271 | 271 | if ($death_dates = $person->getAllDeathDates()) { |
272 | - foreach ($death_dates as $num => $death_date) { |
|
273 | - if ($num) { ?><br/><?php } ?> |
|
272 | + foreach ($death_dates as $num => $death_date) { |
|
273 | + if ($num) { ?><br/><?php } ?> |
|
274 | 274 | <?php echo $death_date->display(true); |
275 | - } |
|
276 | - } else { |
|
277 | - $death_date = $person->getEstimatedDeathDate(); |
|
278 | - if ($person->getTree()->getPreference('SHOW_EST_LIST_DATES') && $death_date->minimumJulianDay() < WT_CLIENT_JD) { |
|
279 | - echo $death_date->display(true); |
|
280 | - } elseif ($person->isDead()) { |
|
281 | - echo I18N::translate('yes'); |
|
282 | - } else { |
|
283 | - echo ' '; |
|
284 | - } |
|
285 | - $death_dates[0] = new Date(''); |
|
286 | - } ?> |
|
275 | + } |
|
276 | + } else { |
|
277 | + $death_date = $person->getEstimatedDeathDate(); |
|
278 | + if ($person->getTree()->getPreference('SHOW_EST_LIST_DATES') && $death_date->minimumJulianDay() < WT_CLIENT_JD) { |
|
279 | + echo $death_date->display(true); |
|
280 | + } elseif ($person->isDead()) { |
|
281 | + echo I18N::translate('yes'); |
|
282 | + } else { |
|
283 | + echo ' '; |
|
284 | + } |
|
285 | + $death_dates[0] = new Date(''); |
|
286 | + } ?> |
|
287 | 287 | </td> |
288 | 288 | <td><?php echo $death_date->julianDay(); ?></td> |
289 | 289 | <td><?php echo Date::getAge($birth_dates[0], $death_dates[0], 2); ?></td> |
290 | 290 | <td><?php echo Date::getAge($birth_dates[0], $death_dates[0], 1); ?></td> |
291 | 291 | <td> |
292 | 292 | <?php foreach ($person->getAllDeathPlaces() as $n => $death_place) { |
293 | - $tmp = new Place($death_place, $person->getTree()); |
|
294 | - if ($n) { ?><br><?php } ?> |
|
293 | + $tmp = new Place($death_place, $person->getTree()); |
|
294 | + if ($n) { ?><br><?php } ?> |
|
295 | 295 | <a href="'<?php echo $tmp->getURL(); ?>" title="<?php echo strip_tags($tmp->getFullName()); ?>"> |
296 | 296 | <?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($tmp->getShortName()); ?> |
297 | 297 | </a> |
298 | 298 | <?php } ?> |
299 | 299 | </td> |
300 | 300 | <?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) { |
301 | - $isDSourced = $dperson->isDeathSourced(); ?> |
|
301 | + $isDSourced = $dperson->isDeathSourced(); ?> |
|
302 | 302 | <td><?php echo FunctionsPrint::formatIsSourcedIcon('E', $isDSourced, 'DEAT', 1, 'medium'); ?></td> |
303 | 303 | <td><?php echo $isDSourced; ?></td> |
304 | 304 | <?php } else { ?> |
@@ -308,29 +308,29 @@ discard block |
||
308 | 308 | <td><?php echo $person->getSex(); ?></td> |
309 | 309 | <td> |
310 | 310 | <?php if (!$person->canShow() || Date::compare($birth_date, new Date(date('Y') - 100)) > 0) { |
311 | - echo 'Y100'; |
|
312 | - } else { |
|
313 | - echo 'YES'; |
|
314 | - } ?> |
|
311 | + echo 'Y100'; |
|
312 | + } else { |
|
313 | + echo 'YES'; |
|
314 | + } ?> |
|
315 | 315 | </td> |
316 | 316 | <td> |
317 | 317 | <?php if (Date::compare($death_dates[0], new Date(date('Y') - 100)) > 0) { |
318 | - echo 'Y100'; |
|
319 | - } elseif ($death_dates[0]->minimumJulianDay() || $person->isDead()) { |
|
320 | - echo 'YES'; |
|
321 | - } else { |
|
322 | - echo 'N'; |
|
323 | - } ?> |
|
318 | + echo 'Y100'; |
|
319 | + } elseif ($death_dates[0]->minimumJulianDay() || $person->isDead()) { |
|
320 | + echo 'YES'; |
|
321 | + } else { |
|
322 | + echo 'N'; |
|
323 | + } ?> |
|
324 | 324 | </td> |
325 | 325 | <td> |
326 | 326 | <?php if (!$person->getChildFamilies()) { |
327 | - echo 'R'; |
|
327 | + echo 'R'; |
|
328 | 328 | } // roots |
329 | 329 | elseif (!$person->isDead() && $person->getNumberOfChildren() < 1) { |
330 | - echo 'L'; |
|
330 | + echo 'L'; |
|
331 | 331 | } // leaves |
332 | 332 | else { |
333 | - echo ' '; |
|
333 | + echo ' '; |
|
334 | 334 | } ?> |
335 | 335 | </td> |
336 | 336 | </tr> |
@@ -341,12 +341,12 @@ discard block |
||
341 | 341 | <th class="ui-state-default" colspan="22"> |
342 | 342 | <div class="center"> |
343 | 343 | <?php echo I18N::translate('Number of Sosa ancestors: %1$s known / %2$s theoretical (%3$s)', |
344 | - I18N::number($this->data->get('sosa_count')), |
|
345 | - I18N::number($this->data->get('sosa_theo')), |
|
346 | - I18N::percentage($this->data->get('sosa_ratio'),2) |
|
347 | - ); ?> |
|
344 | + I18N::number($this->data->get('sosa_count')), |
|
345 | + I18N::number($this->data->get('sosa_theo')), |
|
346 | + I18N::percentage($this->data->get('sosa_ratio'),2) |
|
347 | + ); ?> |
|
348 | 348 | <?php if($this->data->get('sosa_hidden') > 0) { |
349 | - echo '['. I18N::translate('%s hidden', I18N::number($this->data->get('sosa_hidden'))).']'; |
|
349 | + echo '['. I18N::translate('%s hidden', I18N::number($this->data->get('sosa_hidden'))).']'; |
|
350 | 350 | } ?> |
351 | 351 | </div> |
352 | 352 | </th> |
@@ -380,8 +380,8 @@ discard block |
||
380 | 380 | </div> |
381 | 381 | </div> |
382 | 382 | <?php |
383 | - } |
|
384 | - } |
|
383 | + } |
|
384 | + } |
|
385 | 385 | |
386 | 386 | } |
387 | 387 | |
388 | 388 | \ No newline at end of file |
@@ -33,12 +33,12 @@ discard block |
||
33 | 33 | */ |
34 | 34 | protected function renderContent() { |
35 | 35 | |
36 | - if($this->data->get('has_sosa', false)) { |
|
36 | + if ($this->data->get('has_sosa', false)) { |
|
37 | 37 | $table_id = $this->data->get('table_id'); |
38 | 38 | ?> |
39 | 39 | |
40 | 40 | <div id="sosa-indi-list" class="sosa-list"> |
41 | - <table id="<?php echo $table_id;?>"> |
|
41 | + <table id="<?php echo $table_id; ?>"> |
|
42 | 42 | <thead> |
43 | 43 | <tr> |
44 | 44 | <th colspan="22"> |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | </thead> |
186 | 186 | <tbody> |
187 | 187 | |
188 | - <?php foreach($this->data->get('sosa_list') as $sosa => $person) { |
|
188 | + <?php foreach ($this->data->get('sosa_list') as $sosa => $person) { |
|
189 | 189 | /** @var \Fisharebest\Webtrees\Individual $person */ |
190 | 190 | if ($person->isPendingAddtion()) { |
191 | 191 | $class = ' class="new"'; |
@@ -201,18 +201,18 @@ discard block |
||
201 | 201 | <td class="transparent"><?php echo $person->getXref(); ?></td> |
202 | 202 | <td colspan="2"> |
203 | 203 | <?php foreach ($person->getAllNames() as $num=>$name) { |
204 | - if ($name['type']=='NAME') { |
|
205 | - $title=''; |
|
204 | + if ($name['type'] == 'NAME') { |
|
205 | + $title = ''; |
|
206 | 206 | } else { |
207 | - $title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"'; |
|
207 | + $title = 'title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"'; |
|
208 | 208 | } |
209 | - if ($num==$person->getPrimaryName()) { |
|
210 | - $class=' class="name2"'; |
|
211 | - $sex_image=$person->getSexImage(); |
|
212 | - list($surn, $givn)=explode(',', $name['sort']); |
|
209 | + if ($num == $person->getPrimaryName()) { |
|
210 | + $class = ' class="name2"'; |
|
211 | + $sex_image = $person->getSexImage(); |
|
212 | + list($surn, $givn) = explode(',', $name['sort']); |
|
213 | 213 | } else { |
214 | - $class=''; |
|
215 | - $sex_image=''; |
|
214 | + $class = ''; |
|
215 | + $sex_image = ''; |
|
216 | 216 | } ?> |
217 | 217 | <a <?php echo $title.' '.$class; ?> href="<?php echo $person->getHtmlUrl(); ?>"> |
218 | 218 | <?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']); ?> |
@@ -225,20 +225,20 @@ discard block |
||
225 | 225 | </td> |
226 | 226 | <td style="display:none;"></td> |
227 | 227 | <td> |
228 | - <?php echo Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)) . 'AAAA' . Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)); ?> |
|
228 | + <?php echo Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)).'AAAA'.Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)); ?> |
|
229 | 229 | </td> |
230 | 230 | <td> |
231 | - <?php echo Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)) . 'AAAA' . Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)); ?> |
|
231 | + <?php echo Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)).'AAAA'.Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)); ?> |
|
232 | 232 | </td> |
233 | 233 | <td> |
234 | 234 | <?php |
235 | - if ($birth_dates=$person->getAllBirthDates()) { |
|
235 | + if ($birth_dates = $person->getAllBirthDates()) { |
|
236 | 236 | foreach ($birth_dates as $num=>$birth_date) { |
237 | 237 | if ($num) { ?><br/><?php } ?> |
238 | 238 | <?php echo $birth_date->display(true); |
239 | 239 | } |
240 | 240 | } else { |
241 | - $birth_date=$person->getEstimatedBirthDate(); |
|
241 | + $birth_date = $person->getEstimatedBirthDate(); |
|
242 | 242 | if ($person->getTree()->getPreference('SHOW_EST_LIST_DATES')) { |
243 | 243 | $birth_date->display(true); |
244 | 244 | } else { |
@@ -248,7 +248,7 @@ discard block |
||
248 | 248 | } |
249 | 249 | ?> |
250 | 250 | </td> |
251 | - <td><?php echo $birth_date->julianDay();?></td> |
|
251 | + <td><?php echo $birth_date->julianDay(); ?></td> |
|
252 | 252 | <td> |
253 | 253 | <?php foreach ($person->getAllBirthPlaces() as $n => $birth_place) { |
254 | 254 | $tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree()); |
@@ -343,10 +343,10 @@ discard block |
||
343 | 343 | <?php echo I18N::translate('Number of Sosa ancestors: %1$s known / %2$s theoretical (%3$s)', |
344 | 344 | I18N::number($this->data->get('sosa_count')), |
345 | 345 | I18N::number($this->data->get('sosa_theo')), |
346 | - I18N::percentage($this->data->get('sosa_ratio'),2) |
|
346 | + I18N::percentage($this->data->get('sosa_ratio'), 2) |
|
347 | 347 | ); ?> |
348 | - <?php if($this->data->get('sosa_hidden') > 0) { |
|
349 | - echo '['. I18N::translate('%s hidden', I18N::number($this->data->get('sosa_hidden'))).']'; |
|
348 | + <?php if ($this->data->get('sosa_hidden') > 0) { |
|
349 | + echo '['.I18N::translate('%s hidden', I18N::number($this->data->get('sosa_hidden'))).']'; |
|
350 | 350 | } ?> |
351 | 351 | </div> |
352 | 352 | </th> |
@@ -358,7 +358,7 @@ discard block |
||
358 | 358 | <button type="button" class="ui-state-default btn-toggle-parents"> |
359 | 359 | <?php echo I18N::translate('Show parents') ?> |
360 | 360 | </button> |
361 | - <button id="btn-toggle-statistics-<?php echo $table_id ;?>" type="button" class="ui-state-default btn-toggle-statistics"> |
|
361 | + <button id="btn-toggle-statistics-<?php echo $table_id; ?>" type="button" class="ui-state-default btn-toggle-statistics"> |
|
362 | 362 | <?php echo I18N::translate('Show statistics charts') ?> |
363 | 363 | </button> |
364 | 364 | </div> |