Skip to content

S
simpkm
Commit 2bb855e5 by Farendi Giotivano R.P
Options

Merge branch 'master' of http://git.unesa.ac.id/farendi/simpkm

parents 00619a49 6b7939a6
Showing with 55 additions and 20 deletions
app/Http/Controllers/Operator/ReviewerController.php
......@@ -197,14 +197,35 @@ class ReviewerController extends Controller
public function getDosen(Request $request)
{
$draw = $request->get('draw');
$start = $request->get("start");
$rowperpage = $request->get("length"); // Rows display per page
$columnIndex_arr = $request->get('order');
$columnName_arr = $request->get('columns');
$order_arr = $request->get('order');
$search_arr = $request->get('search');
$columnIndex = $columnIndex_arr[0]['column']; // Column index
$columnName = $columnName_arr[$columnIndex]['data']; // Column name
$columnSortOrder = $order_arr[0]['dir']; // asc or desc
$searchValue = strtoupper($search_arr['value']); // Search value
$tipe = $request->get('tipe');
$i = 0;
if($start == 0)
$page = 1;
else
$page = ($start/10)+1;
if($tipe == '1' || $tipe == '' || $tipe == null)
{
$client = new Client();
$response = $client->request('GET', 'https://i-sdm.unesa.ac.id/api/data-dosen');
$response = $client->request('GET', 'https://i-sdm.unesa.ac.id/api/detil-data-dosen?per_page='.$rowperpage.'&page='.$page.'&keyword='.$searchValue.'');
$data = json_decode($response->getBody(), true);
$total = $data['count'];
$result = [];
foreach ($data['data'] as $key => $value) {
......@@ -233,7 +254,7 @@ class ReviewerController extends Controller
$users = User::with(['rBiodata','rolesCustom'])->whereHas('rolesCustom',function ($q){
$q->whereIn('name', ['reviewer']);
})->where('status', '2')->get();
$total += count($users);
$j = $i?:0;
foreach ($users as $key => $value) {
$result[$j]['nm_sdm'] = $value->name;
......@@ -251,7 +272,15 @@ class ReviewerController extends Controller
$hasil['pesan'] = "sukses";
$hasil['data'] = $result;
return $hasil;
$response = array(
"draw" => $draw,
"iTotalRecords" => $total,
"iTotalDisplayRecords" => $total,
"aaData" => $result
);
return $response;
// $client = new Client(['base_uri' => 'https://siakadu.unesa.ac.id/']);
......
app/Repositories/Auth/BiodataRepository.php
......@@ -33,10 +33,31 @@ class BiodataRepository
$apiRequest = $client->request('GET', 'https://i-sdm.unesa.ac.id/biodataumum/'.trim($auth[0]->userid));
$isdm = json_decode($apiRequest->getBody()->getContents());
if($isdm[0]->email == null || $isdm[0]->email == '')
{
$url = "https://i-sdm.unesa.ac.id/api/email/update/";
$token = '964cXM2eJmJVGLsj8x3M6gMi9kislGgobrbmzo6880m1mRRc9CLdW9v3Fh7VaLM0';
$headers = [
"Authorization" => "Bearer " . $token,
"Accept" => "application/json",
];
$api_call = $client->request('POST', $url,[
'headers' => $headers,
'form_params' => [
'nip' => $isdm[0]->nip,
'email' => $auth[0]->email
]
]);
$call_data = json_decode($api_call->getBody()->getContents());
}
// ubah novan karena ambil email dari isdm saja jangan dari auth;
// $data['email'] = $auth[0]->email;
// $data['noid'] = $isdm[0]->nip;
$data['email'] = $isdm[0]->email;
$data['email'] = $auth[0]->email;
$data['name'] = $isdm[0]->nama;
$data['noid'] = $isdm[0]->nidn;
if ($isdm[0]->isdosen == 0) {
......
resources/views/backend/operator/daftar_proposal/belmawa.blade.php
......@@ -48,7 +48,6 @@
<option value="{{ $res->jenis_id }}">{{ $res->nama }}</option>
@endforeach
</select>
</select>
</div>
</div>
</div>
......@@ -62,7 +61,6 @@
<option value="2">Lolos</option>
<option value="3">Tidak Lolos</option>
</select>
</select>
</div>
</div>
</div>
......@@ -76,7 +74,6 @@
<option value="{{ $res->nama }}">{{ $res->nama }}</option>
@endforeach
</select>
</select>
</div>
</div>
</div>
......
resources/views/backend/operator/daftar_proposal/index.blade.php
......@@ -48,7 +48,6 @@
<option value="{{ $res->jenis_id }}">{{ $res->nama }}</option>
@endforeach
</select>
</select>
</div>
</div>
</div>
......@@ -62,7 +61,6 @@
<option value="2">Lolos</option>
<option value="3">Tidak Lolos</option>
</select>
</select>
</div>
</div>
</div>
......@@ -76,7 +74,6 @@
<option value="{{ $res->nama }}">{{ $res->nama }}</option>
@endforeach
</select>
</select>
</div>
</div>
</div>
......
resources/views/backend/operator/daftar_proposal/monev.blade.php
......@@ -52,7 +52,6 @@
<option value="{{ $res->jenis_id }}">{{ $res->nama }}</option>
@endforeach
</select>
</select>
</div>
</div>
</div>
......@@ -65,7 +64,6 @@
<option value="1">Sudah dinilai</option>
<option value="2">Belum dinilai</option>
</select>
</select>
</div>
</div>
</div>
......@@ -79,7 +77,6 @@
<option value="{{ $res->nama }}">{{ $res->nama }}</option>
@endforeach
</select>
</select>
</div>
</div>
</div>
......
resources/views/backend/operator/kelompok/index.blade.php
......@@ -41,7 +41,6 @@
<option value="2">Disetujui</option>
<option value="3">Ditolak</option>
</select>
</select>
</div>
</div>
</div>
......@@ -55,7 +54,6 @@
<option value="{{ $res->nama }}">{{ $res->nama }}</option>
@endforeach
</select>
</select>
</div>
</div>
</div>
......
resources/views/backend/operator/proposal/index.blade.php
......@@ -47,7 +47,6 @@
<option value="{{ $res->jenis_id }}">{{ $res->nama }}</option>
@endforeach
</select>
</select>
</div>
</div>
</div>
......@@ -61,7 +60,6 @@
<option value="2">Disetujui Dosen</option>
<option value="3">Ditolak Dosen</option>
</select>
</select>
</div>
</div>
</div>
......@@ -75,7 +73,6 @@
<option value="{{ $res->nama }}">{{ $res->nama }}</option>
@endforeach
</select>
</select>
</div>
</div>
</div>
......
resources/views/backend/operator/reviewer/index.blade.php
......@@ -135,7 +135,6 @@
var oTable1 = $('#example1').DataTable({
paging: true,
lengthChange: true,
searching: true,
ordering: true,
info: true,
......
resources/views/backend/operator/reviewer/monev.blade.php
......@@ -132,12 +132,12 @@
var oTable1 = $('#example1').DataTable({
paging: true,
lengthChange: true,
searching: true,
ordering: true,
info: true,
autoWidth: true,
processing: true,
serverSide: true,
ajax: {
url: "{{route('operator.getDosen')}}",
dataSrc: 'data'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment