|
@@ -1146,7 +1146,7 @@ Route::get('/get_course_members', function () {
|
|
|
|
|
|
|
|
//$datas = \App\Models\MemberCourse::with('member');
|
|
//$datas = \App\Models\MemberCourse::with('member');
|
|
|
|
|
|
|
|
- $datas = \App\Models\MemberCourse::select('member_courses.*', 'courses.name as course_name', 'members.first_name', 'members.last_name', 'members.email', 'members.phone', 'members.birth_date')
|
|
|
|
|
|
|
+ $datas = \App\Models\MemberCourse::select('member_courses.*', 'courses.name as course_name', 'members.first_name', 'members.last_name', 'members.email', 'members.phone', 'members.birth_date','members.gender')
|
|
|
->leftJoin('courses', 'member_courses.course_id', '=', 'courses.id')
|
|
->leftJoin('courses', 'member_courses.course_id', '=', 'courses.id')
|
|
|
->leftJoin('members', 'member_courses.member_id', '=', 'members.id');
|
|
->leftJoin('members', 'member_courses.member_id', '=', 'members.id');
|
|
|
|
|
|
|
@@ -1330,6 +1330,8 @@ Route::get('/get_course_members', function () {
|
|
|
//$this->filter .= "Anno : " . $this->filterYear . " ";
|
|
//$this->filter .= "Anno : " . $this->filterYear . " ";
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
$aRet = [];
|
|
$aRet = [];
|
|
|
|
|
|
|
|
if (isset($_GET["order"])) {
|
|
if (isset($_GET["order"])) {
|
|
@@ -1350,6 +1352,8 @@ Route::get('/get_course_members', function () {
|
|
|
$column = 'phone';
|
|
$column = 'phone';
|
|
|
if ($_GET["order"][0]["column"] == 8)
|
|
if ($_GET["order"][0]["column"] == 8)
|
|
|
$column = 'certificate_expire_date';
|
|
$column = 'certificate_expire_date';
|
|
|
|
|
+ if ($_GET["order"][0]["column"] == 9)
|
|
|
|
|
+ $column = 'gender';
|
|
|
if ($column != '')
|
|
if ($column != '')
|
|
|
$datas = $datas->orderBy($column, $_GET["order"][0]["dir"]);
|
|
$datas = $datas->orderBy($column, $_GET["order"][0]["dir"]);
|
|
|
else
|
|
else
|
|
@@ -1398,6 +1402,17 @@ Route::get('/get_course_members', function () {
|
|
|
$certificateInfo = $status . "|" . date("d/m/Y", strtotime($certificate->expire_date)) . "|" . $certificate->type;
|
|
$certificateInfo = $status . "|" . date("d/m/Y", strtotime($certificate->expire_date)) . "|" . $certificate->type;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ $genderDisplay = "";
|
|
|
|
|
+ if ($r->gender == 'M' || $r->gender == 'U') {
|
|
|
|
|
+ $genderDisplay = "Uomo";
|
|
|
|
|
+ } elseif ($r->gender == 'F' || $r->gender == 'D') {
|
|
|
|
|
+ $genderDisplay = "Donna";
|
|
|
|
|
+ } elseif ($r->gender == 'O') {
|
|
|
|
|
+ $genderDisplay = "Altro";
|
|
|
|
|
+ }elseif ($r->gender == null || $r->gender == "") {
|
|
|
|
|
+ $genderDisplay = "N/A";
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
$ret[] = array(
|
|
$ret[] = array(
|
|
|
"column_0" => $idx + 1,
|
|
"column_0" => $idx + 1,
|
|
|
"column_8" => $r->course_name,
|
|
"column_8" => $r->course_name,
|
|
@@ -1405,9 +1420,10 @@ Route::get('/get_course_members', function () {
|
|
|
"column_2" => $r->first_name,
|
|
"column_2" => $r->first_name,
|
|
|
"column_3" => strval($interval->y),
|
|
"column_3" => strval($interval->y),
|
|
|
"column_4" => date("Y", strtotime($r->birth_date)),
|
|
"column_4" => date("Y", strtotime($r->birth_date)),
|
|
|
|
|
+ "column_9" => $genderDisplay,
|
|
|
"column_5" => $r->phone,
|
|
"column_5" => $r->phone,
|
|
|
"column_6" => $certificateInfo,
|
|
"column_6" => $certificateInfo,
|
|
|
- "column_7" => $r->member_id
|
|
|
|
|
|
|
+ "column_7" => $r->member_id,
|
|
|
);
|
|
);
|
|
|
}
|
|
}
|
|
|
|
|
|