Skip to content

S
simpkm
Commit e95e4598 by novanbagus
Options

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

parents 88a3593f 5156298e
Showing with 43 additions and 24 deletions
app/Http/Controllers/Operator/ProposalController.php
...@@ -34,6 +34,7 @@ class ProposalController extends Controller ...@@ -34,6 +34,7 @@ class ProposalController extends Controller
$tahun= $request->get('tahun'); $tahun= $request->get('tahun');
## Read value ## Read value
$year = !is_null($request->year) ? $request->year : now()->year;
$draw = $request->get('draw'); $draw = $request->get('draw');
$start = $request->get("start"); $start = $request->get("start");
$rowperpage = $request->get("length"); // Rows display per page $rowperpage = $request->get("length"); // Rows display per page
...@@ -71,12 +72,13 @@ class ProposalController extends Controller ...@@ -71,12 +72,13 @@ class ProposalController extends Controller
$totalRecords = DaftarProposal::select('count(1) as allcount')->whereRaw($statementGlobal)->count(); $totalRecords = DaftarProposal::select('count(1) as allcount')->whereRaw($statementGlobal)->count();
$statement = " AND (UPPER(JUDUL) LIKE '%".$searchValue."%') "; $statement = " AND (UPPER(JUDUL) LIKE '%".$searchValue."%') ";
$totalRecordswithFilter = DaftarProposal::select('count(1) as allcount') $totalRecordswithFilter = DaftarProposal::select('count(1) as allcount')
->whereRaw($statementGlobal.$statement)->count(); ->whereRaw($statementGlobal.$statement.$whereYear)->count();
// Fetch records // Fetch records
$records = DaftarProposal::orderBy($columnName,$columnSortOrder) $records = DaftarProposal::orderBy($columnName,$columnSortOrder)
->whereRaw($statementGlobal.$statement) ->whereRaw($statementGlobal.$statement.$whereYear)
->selectRaw('*') ->selectRaw('*')
->skip($start) ->skip($start)
->take($rowperpage) ->take($rowperpage)
......
resources/views/backend/dosen/proposal/index.blade.php
...@@ -137,8 +137,8 @@ ...@@ -137,8 +137,8 @@
<th>Proposal</th> <th>Proposal</th>
<td> <td>
@if($item->upload_dokumen) @if($item->upload_dokumen)
<a href="https://statik.unesa.ac.id/simpkm/proposal/{{ $item->rPeriode->nama }}/{{ $item->upload_dokumen }}" target="_blank" class="btn btn-success btn-sm"> <i class="far fa-eye"></i> Lihat Proposal</a> <a href="https://statik.unesa.ac.id/simpkm/proposal/{{ $item->rPeriode->nama }}/{{ $item->upload_dokumen }}" target="_blank" class="btn btn-success btn-sm"> <i class="far fa-eye"></i> Lihat Proposal</a>
{{-- <embed id="view-pdf" width="100%" height="400px" src="https://statik.unesa.ac.id/simpkm/proposal/{{ $item->rPeriode->nama }}/{{ $item->upload_dokumen }}" frameborder="0"></embed> --}} <iframe id="view-pdf" width="100%" height="400px" src="https://statik.unesa.ac.id/simpkm/proposal/{{ $item->rPeriode->nama }}/{{ $item->upload_dokumen }}" frameborder="0"></iframe>
@else @else
<div class="alert alert-danger alert-dismissible fade show mb-0" role="alert"> <div class="alert alert-danger alert-dismissible fade show mb-0" role="alert">
<strong>Informasi!</strong><br/> File tidak ditemukan. <strong>Informasi!</strong><br/> File tidak ditemukan.
......
resources/views/backend/dosen/seleksi/index_belmawa.blade.php
...@@ -121,7 +121,10 @@ ...@@ -121,7 +121,10 @@
</tr> </tr>
<tr> <tr>
<th>Proposal</th> <th>Proposal</th>
<td> <iframe id="view-pdf" width="100%" height="200px" src="https://statik.unesa.ac.id/simpkm/proposal/revisi/{{ $item->rPeriode->nama }}/{{ $item->upload_dokumen }}" frameborder="0"></iframe></td> <td>
<a href="https://statik.unesa.ac.id/simpkm/proposal/revisi/{{ $item->rPeriode->nama }}/{{ $item->revisi_filebelmawa }}" target="_blank" class="btn btn-success btn-sm"> <i class="far fa-eye"></i> Lihat Proposal</a>
<iframe id="view-pdf" width="100%" height="200px" src="https://statik.unesa.ac.id/simpkm/proposal/revisi/{{ $item->rPeriode->nama }}/{{ $item->revisi_filebelmawa }}" frameborder="0"></iframe>
</td>
</tr> </tr>
<tr> <tr>
<th>Komentar</th> <th>Komentar</th>
......
resources/views/backend/dosen/seleksi/index_internal.blade.php
...@@ -117,7 +117,10 @@ ...@@ -117,7 +117,10 @@
</tr> </tr>
<tr> <tr>
<th>Proposal</th> <th>Proposal</th>
<td> <iframe id="view-pdf" width="100%" height="200px" src="https://statik.unesa.ac.id/simpkm/proposal/{{ $item->rPeriode->nama }}/{{ $item->upload_dokumen }}" frameborder="0"></iframe></td> <td>
<a href="https://statik.unesa.ac.id/simpkm/proposal/{{ $item->rPeriode->nama }}/{{ $item->upload_dokumen }}" target="_blank" class="btn btn-success btn-sm"> <i class="far fa-eye"></i> Lihat Proposal</a>
<iframe id="view-pdf" width="100%" height="200px" src="https://statik.unesa.ac.id/simpkm/proposal/{{ $item->rPeriode->nama }}/{{ $item->upload_dokumen }}" frameborder="0"></iframe>
</td>
</tr> </tr>
<tr> <tr>
<th>Komentar</th> <th>Komentar</th>
......
resources/views/backend/mahasiswa/monev/indexmonevI.blade.php
...@@ -132,21 +132,21 @@ ...@@ -132,21 +132,21 @@
<tr> <tr>
<th>Nilai</th> <th>Nilai</th>
<td> <td>
<h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilaiMonev->rReviewerBio1 ? $item->rNilaiMonev->rReviewerBio1->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 1</h4>
<h5 class="text-muted mt-3">Nilai - {{ $item->rNilaiMonev->nilai_1 }}</h5> <h5 class="text-muted mt-3">Nilai - {{ $item->rNilaiMonev->nilai_1 }}</h5>
</td> </td>
<td> <td>
<h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilaiMonev->rReviewerBio2 ? $item->rNilaiMonev->rReviewerBio2->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 2</h4>
<h5 class="text-primary mt-3">Nilai - {{ $item->rNilaiMonev->nilai_2 }}</h5> <h5 class="text-primary mt-3">Nilai - {{ $item->rNilaiMonev->nilai_2 }}</h5>
</td> </td>
</tr> </tr>
<tr> <tr>
<th>Komentar</th> <th>Komentar</th>
<td colspan="2"> <td colspan="2">
<h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilaiMonev->rReviewerBio1 ? $item->rNilaiMonev->rReviewerBio1->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 1</h4>
<p class="text-muted mb-3 pb-4">" {{ $item->rNilaiMonev->reviewer_komentar_1 }}"</p> <p class="text-muted mb-3 pb-4">" {{ $item->rNilaiMonev->reviewer_komentar_1 }}"</p>
<h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilaiMonev->rReviewerBio2 ? $item->rNilaiMonev->rReviewerBio2->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 2</h4>
<p class="text-muted mb-3 pb-4">" {{ $item->rNilaiMonev->reviewer_komentar_2 }}"</p> <p class="text-muted mb-3 pb-4">" {{ $item->rNilaiMonev->reviewer_komentar_2 }}"</p>
</td> </td>
</tr> </tr>
......
resources/views/backend/mahasiswa/monev/indexmonevII.blade.php
...@@ -132,21 +132,21 @@ ...@@ -132,21 +132,21 @@
<tr> <tr>
<th>Nilai</th> <th>Nilai</th>
<td> <td>
<h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilaiMonev->rReviewerBio1 ? $item->rNilaiMonev->rReviewerBio1->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 1</h4>
<h5 class="text-muted mt-3">Nilai - {{ $item->rNilaiMonev->nilai_1 }}</h5> <h5 class="text-muted mt-3">Nilai - {{ $item->rNilaiMonev->nilai_1 }}</h5>
</td> </td>
<td> <td>
<h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilaiMonev->rReviewerBio2 ? $item->rNilaiMonev->rReviewerBio2->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 2</h4>
<h5 class="text-primary mt-3">Nilai - {{ $item->rNilaiMonev->nilai_2 }}</h5> <h5 class="text-primary mt-3">Nilai - {{ $item->rNilaiMonev->nilai_2 }}</h5>
</td> </td>
</tr> </tr>
<tr> <tr>
<th>Komentar</th> <th>Komentar</th>
<td colspan="2"> <td colspan="2">
<h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilaiMonev->rReviewerBio1 ? $item->rNilaiMonev->rReviewerBio1->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 1</h4>
<p class="text-muted mb-3 pb-4">" {{ $item->rNilaiMonev->reviewer_komentar_1 }}"</p> <p class="text-muted mb-3 pb-4">" {{ $item->rNilaiMonev->reviewer_komentar_1 }}"</p>
<h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilaiMonev->rReviewerBio2 ? $item->rNilaiMonev->rReviewerBio2->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 2</h4>
<p class="text-muted mb-3 pb-4">" {{ $item->rNilaiMonev->reviewer_komentar_2 }}"</p> <p class="text-muted mb-3 pb-4">" {{ $item->rNilaiMonev->reviewer_komentar_2 }}"</p>
</td> </td>
</tr> </tr>
......
resources/views/backend/mahasiswa/monev/indexmonevIII.blade.php
...@@ -140,21 +140,21 @@ ...@@ -140,21 +140,21 @@
<tr> <tr>
<th>Nilai</th> <th>Nilai</th>
<td> <td>
<h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilaiMonev->rReviewerBio1 ? $item->rNilaiMonev->rReviewerBio1->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 1</h4>
<h5 class="text-muted mt-3">Nilai - {{ $item->rNilaiMonev->nilai_1 }}</h5> <h5 class="text-muted mt-3">Nilai - {{ $item->rNilaiMonev->nilai_1 }}</h5>
</td> </td>
<td> <td>
<h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilaiMonev->rReviewerBio2 ? $item->rNilaiMonev->rReviewerBio2->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 2</h4>
<h5 class="text-primary mt-3">Nilai - {{ $item->rNilaiMonev->nilai_2 }}</h5> <h5 class="text-primary mt-3">Nilai - {{ $item->rNilaiMonev->nilai_2 }}</h5>
</td> </td>
</tr> </tr>
<tr> <tr>
<th>Komentar</th> <th>Komentar</th>
<td colspan="2"> <td colspan="2">
<h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilaiMonev->rReviewerBio1 ? $item->rNilaiMonev->rReviewerBio1->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 1</h4>
<p class="text-muted mb-3 pb-4">" {{ $item->rNilaiMonev->reviewer_komentar_1 }}"</p> <p class="text-muted mb-3 pb-4">" {{ $item->rNilaiMonev->reviewer_komentar_1 }}"</p>
<h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilaiMonev->rReviewerBio2 ? $item->rNilaiMonev->rReviewerBio2->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 2</h4>
<p class="text-muted mb-3 pb-4">" {{ $item->rNilaiMonev->reviewer_komentar_2 }}"</p> <p class="text-muted mb-3 pb-4">" {{ $item->rNilaiMonev->reviewer_komentar_2 }}"</p>
</td> </td>
</tr> </tr>
......
resources/views/backend/mahasiswa/proposal/index.blade.php
...@@ -140,6 +140,7 @@ ...@@ -140,6 +140,7 @@
<th>Proposal</th> <th>Proposal</th>
<td> <td>
@if($item->upload_dokumen) @if($item->upload_dokumen)
<a href="https://statik.unesa.ac.id/simpkm/proposal/{{ $item->rPeriode->nama }}/{{ $item->upload_dokumen }}" target="_blank" class="btn btn-success btn-sm"> <i class="far fa-eye"></i> Lihat Proposal</a>
<iframe id="view-pdf" width="100%" height="400px" src="https://statik.unesa.ac.id/simpkm/proposal/{{ $item->rPeriode->nama }}/{{ $item->upload_dokumen }}" frameborder="0"></iframe> <iframe id="view-pdf" width="100%" height="400px" src="https://statik.unesa.ac.id/simpkm/proposal/{{ $item->rPeriode->nama }}/{{ $item->upload_dokumen }}" frameborder="0"></iframe>
@else @else
<div class="alert alert-danger alert-dismissible fade show mb-0" role="alert"> <div class="alert alert-danger alert-dismissible fade show mb-0" role="alert">
......
resources/views/backend/mahasiswa/seleksi/index_belmawa.blade.php
...@@ -125,7 +125,10 @@ ...@@ -125,7 +125,10 @@
</tr> </tr>
<tr> <tr>
<th>Proposal</th> <th>Proposal</th>
<td> <iframe id="view-pdf" width="100%" height="200px" src="https://statik.unesa.ac.id/simpkm/proposal/revisi/{{ $item->rPeriode->nama }}/{{ $item->revisi_filebelmawa }}" frameborder="0"></iframe></td> <td>
<a href="https://statik.unesa.ac.id/simpkm/proposal/revisi/{{ $item->rPeriode->nama }}/{{ $item->revisi_filebelmawa }}" target="_blank" class="btn btn-success btn-sm"> <i class="far fa-eye"></i> Lihat Proposal</a>
<iframe id="view-pdf" width="100%" height="400px" src="https://statik.unesa.ac.id/simpkm/proposal/revisi/{{ $item->rPeriode->nama }}/{{ $item->revisi_filebelmawa }}" frameborder="0"></iframe>
</td>
</tr> </tr>
<tr> <tr>
<th>Komentar</th> <th>Komentar</th>
......
resources/views/backend/mahasiswa/seleksi/index_internal.blade.php
...@@ -120,15 +120,22 @@ ...@@ -120,15 +120,22 @@
</tr> </tr>
<tr> <tr>
<th>Proposal</th> <th>Proposal</th>
<td> <iframe id="view-pdf" width="100%" height="180px" src="https://statik.unesa.ac.id/simpkm/proposal/{{ $item->rPeriode->nama }}/{{ $item->upload_dokumen }}" frameborder="0"></iframe></td> <td>
<a href="https://statik.unesa.ac.id/simpkm/proposal/{{ $item->rPeriode->nama }}/{{ $item->upload_dokumen }}" target="_blank" class="btn btn-success btn-sm"> <i class="far fa-eye"></i> Lihat Proposal</a>
</td>
</tr> </tr>
<tr> <tr>
<th>Komentar</th> <th>Komentar</th>
<td> <td>
<h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilai->rReviewerBio1 ? $item->rNilai->rReviewerBio1->nama : '' }}</h4> <h4 class="card-title mb-4">Nilai Total </h4>
@php $rata = ($item->rNilai->nilai_1 + $item->rNilai->nilai_2) / 2; @endphp
<p class="text-muted mb-3 pb-4"> {{ $rata }}</p>
<h4 class="card-title mb-4">Reviewer 1 </h4>
<p class="text-muted mb-3 pb-4">" {{ $item->rNilai->reviewer_komentar_1 }}"</p> <p class="text-muted mb-3 pb-4">" {{ $item->rNilai->reviewer_komentar_1 }}"</p>
<h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilai->rReviewerBio2 ? $item->rNilai->rReviewerBio2->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 2 </h4>
<p class="text-muted mb-3 pb-4">" {{ $item->rNilai->reviewer_komentar_2 }}"</p> <p class="text-muted mb-3 pb-4">" {{ $item->rNilai->reviewer_komentar_2 }}"</p>
</td> </td>
</tr> </tr>
......
resources/views/layouts/headpg.blade.php
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="universitas-negeri-surabaya" content="custom" /> <meta name="universitas-negeri-surabaya" content="custom" />
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="Sistem Informasi Merdeka Belajar Kampus Merdeka"> <meta name="description" content="Sistem Informasi Manajemen Program Kreativitas Mahasiswa">
<meta name="author" content="PPTI Unesa Surabaya"> <meta name="author" content="PPTI Unesa Surabaya">
<meta name="keywords" content="sistem, informasi, merdekabelajar, kkn, magang, plp, unesa, inbound, outbound"> <meta name="keywords" content="sistem, informasi, pkm, program, kreativitas, mahasiswa, unesa">
<meta name="language" content="id"> <meta name="language" content="id">
<meta name="geo.region" content="ID" /> <meta name="geo.region" content="ID" />
<meta name="geo.position" content="-7.300818;112.672689"> <meta name="geo.position" content="-7.300818;112.672689">
......
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