Skip to content

S
simlitabmas
Commit 826c7845 by Farendi Giotivano R.P
Options

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

parents ca6e045d bede6672
Showing with 239 additions and 204 deletions
app/Http/Controllers/User/KekayaanIntelController.php
...@@ -3,7 +3,12 @@ ...@@ -3,7 +3,12 @@
namespace App\Http\Controllers\User; namespace App\Http\Controllers\User;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Models\Biodata;
use App\Models\User\KekayaanIntelektual;
use Exception;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Validator;
class KekayaanIntelController extends Controller class KekayaanIntelController extends Controller
{ {
...@@ -14,8 +19,9 @@ class KekayaanIntelController extends Controller ...@@ -14,8 +19,9 @@ class KekayaanIntelController extends Controller
*/ */
public function index() public function index()
{ {
// $data = KekayaanIntelektual::query()->orderBy('updated_at', 'desc')->get();
return view('user.kekayaan.index');
return view('user.kekayaan.index', ['data' => $data]);
} }
/** /**
...@@ -25,63 +31,95 @@ class KekayaanIntelController extends Controller ...@@ -25,63 +31,95 @@ class KekayaanIntelController extends Controller
*/ */
public function create() public function create()
{ {
// return view('user.kekayaan.create', ['edit' => false]);
return view('user.kekayaan.create');
} }
/** /**
* Store a newly created resource in storage. * Store a newly created resource in storage.
* *
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
public function store(Request $request) public function store(Request $request)
{ {
// $data = $request->except('_token');
Validator::make($data, KekayaanIntelektual::RULES, KekayaanIntelektual::ERROR_MESSAGES)->validate();
try {
$biodata = Biodata::query()->where('nidn', $request->nidn)->firstOrFail();
$data['userid_created'] = Auth::user()->id;
$data['userid_updated'] = Auth::user()->id;
KekayaanIntelektual::query()->create($data);
} catch (Exception $ex) {
return redirect()->back()->withInput();
}
return redirect()->route('kekayaanintelek.index');
} }
/** /**
* Display the specified resource. * Display the specified resource.
* *
* @param int $id * @param int $id
*
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
public function show($id) public function show($id)
{ {
//
} }
/** /**
* Show the form for editing the specified resource. * Show the form for editing the specified resource.
* *
* @param int $id * @param int $id
*
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
public function edit($id) public function edit($id)
{ {
// try {
$data = KekayaanIntelektual::query()->find(decrypt($id));
return view('user.kekayaan.create', [
'edit' => true,
'data' => $data,
]);
} catch (Exception $ex) {
return redirect()->back();
}
} }
/** /**
* Update the specified resource in storage. * Update the specified resource in storage.
* *
* @param \Illuminate\Http\Request $request * @param int $id
* @param int $id *
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
public function update(Request $request, $id) public function update(Request $request, $id)
{ {
// $data = $request->except('_token');
Validator::make($data, KekayaanIntelektual::RULES, KekayaanIntelektual::ERROR_MESSAGES)->validate();
try {
$biodata = Biodata::query()->where('nidn', $request->nidn)->firstOrFail();
$kekayaan = KekayaanIntelektual::query()->findOrFail(decrypt($id));
$data['userid_updated'] = Auth::user()->id;
$kekayaan->update($data);
} catch (Exception $ex) {
return redirect()->back()->withInput();
}
return redirect()->route('kekayaanintelek.index');
} }
/** /**
* Remove the specified resource from storage. * Remove the specified resource from storage.
* *
* @param int $id * @param int $id
*
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
public function destroy($id) public function destroy($id)
{ {
//
} }
} }
app/Http/Controllers/User/PenelitianSumberDanaController.php
...@@ -94,6 +94,7 @@ class PenelitianSumberDanaController extends Controller ...@@ -94,6 +94,7 @@ class PenelitianSumberDanaController extends Controller
if (!is_null($dosen) && $request->name == 'dosen') { if (!is_null($dosen) && $request->name == 'dosen') {
$data['name'] = $request->name; $data['name'] = $request->name;
$data['nama'] = $request->nama;
$data['jenis'] = encrypt($dosen->jenis); $data['jenis'] = encrypt($dosen->jenis);
} elseif (is_null($dosen) && $request->name == 'non_dosen') { } elseif (is_null($dosen) && $request->name == 'non_dosen') {
$data['name'] = $request->name; $data['name'] = $request->name;
......
app/Models/Biodata.php
...@@ -10,5 +10,6 @@ class Biodata extends Model ...@@ -10,5 +10,6 @@ class Biodata extends Model
use HasFactory; use HasFactory;
protected $table = 'biodata'; protected $table = 'biodata';
public $incrementing = false; public $incrementing = false;
protected $keyType = 'string';
protected $fillable = ['id', 'user_id', 'nip', 'nidn', 'name', 'fakultas', 'prodi', 'telephone', 'phone', 'email', 'web', 'userid_created', 'userid_updated', 'jenis']; protected $fillable = ['id', 'user_id', 'nip', 'nidn', 'name', 'fakultas', 'prodi', 'telephone', 'phone', 'email', 'web', 'userid_created', 'userid_updated', 'jenis'];
} }
app/Models/User/KekayaanIntelektual.php 0 → 100644
<?php
namespace App\Models\User;
use App\Models\Biodata;
use App\Traits\UuidTrait;
use Illuminate\Database\Eloquent\Model;
class KekayaanIntelektual extends Model
{
use UuidTrait;
public $incrementing = false;
protected $table = 'kekayaanintelektual';
protected $keyType = 'string';
protected $fillable = ['judul_hki', 'jenis', 'status', 'nopendaftaran', 'nidn'];
public const RULES = [
'judul_hki' => 'required',
'jenis' => 'required',
'status' => 'required',
'nopendaftaran' => 'required',
'nidn' => 'required',
];
public const ERROR_MESSAGES = [
'judul_hki.required' => 'Judul tidak boleh kosong',
'jenis.required' => 'Jenis tidak boleh kosong',
'status.required' => 'Status tidak boleh kosong',
'nopendaftaran.required' => 'No pendaftaran tidak boleh kosong',
'nidn.required' => 'NIDN tidak tervalidasi atau kosong',
];
public function dosen()
{
return $this->belongsTo(Biodata::class, 'nidn', 'nidn');
}
}
public/js/helper.js 0 → 100644
function checkNidn(id) {
var value = $('#input_' + id).val();
var request = $.ajax({
url: "{{ route('get-biodata') }}",
type: "get",
dataType: "json",
data: { nidn: value },
success: function (result) {
$('#nama_' + id).val(result['name']);
$('#prodi_' + id).val(result['prodi']);
$('#' + id).val(result['nidn']);
}
})
}
resources/views/user/kekayaan/create.blade.php
...@@ -15,97 +15,120 @@ ...@@ -15,97 +15,120 @@
$menu = 'dashboard'; $menu = 'dashboard';
@endphp @endphp
<div class="account-settings-container layout-top-spacing"> <div class="account-settings-container layout-top-spacing">
<form action="{{ $edit ? route('kekayaanintelek.update', ['kekayaanintelek' => encrypt($data->id)]) : route('kekayaanintelek.store') }}" method="POST">
@if ($edit)
{{ method_field('PUT') }}
@endif
@csrf
<div class="account-content">
<div class="scrollspy-example" data-spy="scroll" data-target="#account-settings-scroll" data-offset="-100">
<div class="row">
<div class="account-content"> <div class="col-xl-12 col-lg-12 col-md-12 layout-spacing">
<div class="scrollspy-example" data-spy="scroll" data-target="#account-settings-scroll" data-offset="-100"> <div id="general-info" class="section general-info">
<div class="row"> <div class="info">
<h6 class="">Data Dosen</h6>
<div class="col-xl-12 col-lg-12 col-md-12 layout-spacing"> <div class="row">
<form id="general-info" class="section general-info"> <div class="col-lg-11 mx-auto">
<div class="info"> <div class="form-group mb-4">
<h6 class="">Data Dosen</h6> <div class="input-group @if ($errors->has('nidn')) has-error @endif">
<div class="row"> <input type="text" class="form-control" id="input_nidn_dosen" value="{{ $edit ? $data->nidn : '' }}" placeholder="NIDN" aria-label="nidn">
<div class="col-lg-11 mx-auto"> <input type="text" class="form-control" name="nidn" value="{{ $edit ? $data->nidn : '' }}" id="nidn_dosen" placeholder="NIDN" aria-label="nidn" hidden>
<div class="input-group mb-4"> <div class="input-group-append">
<input type="text" class="form-control" placeholder="NIDN" aria-label="nidn"> <button class="btn btn-info" onclick="checkNidn('nidn_dosen')" type="button">Cek</button>
<div class="input-group-append"> </div>
<button class="btn btn-info" type="button">Cek</button> </div>
</div> @if($errors->has('nidn'))
</div> <label id="login-error" class="text-danger" for="login">{{ $errors->first('nidn') }}</label>
<div class="form-row mb-4"> @endif
<div class="form-group col-md-6">
<label for="inputEmail4">Nama Dosen</label>
<input type="text" class="form-control" id="namadosen">
</div> </div>
<div class="form-group col-md-6"> <div class="form-row mb-4">
<label for="inputPassword4">Program Studi</label> <div class="form-group col-md-6">
<input type="text" class="form-control" id="programstudi"> <label for="inputEmail4">Nama Dosen</label>
<input type="text" id="nama_nidn_dosen" class="form-control" id="namadosen" disabled>
</div>
<div class="form-group col-md-6">
<label for="inputPassword4">Program Studi</label>
<input type="text" id="prodi_nidn_dosen" class="form-control" id="programstudi" disabled>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</form> </div>
</div>
<div class="col-xl-12 col-lg-12 col-md-12 layout-spacing"> <div class="col-xl-12 col-lg-12 col-md-12 layout-spacing">
<form id="contact" class="section contact"> <div id="contact" class="section contact">
<div class="info"> <div class="info">
<h5 class="">Data Hak Kekayaan Intelektual</h5> <h5 class="">Data Hak Kekayaan Intelektual</h5>
<div class="row"> <div class="row">
<div class="col-md-11 mx-auto"> <div class="col-md-11 mx-auto">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="form-group"> <div class="form-group @if ($errors->has('judul_hki')) has-error @endif">
<label>Judul HKI</label> <label>Judul HKI</label>
<textarea class="form-control" id="judulhki" placeholder="Judul" rows="3"></textarea> <textarea class="form-control" id="judulhki" name="judul_hki" placeholder="Judul" rows="3" required>{!! $edit ? $data->judul_hki : old('judul_hki') !!}</textarea>
@if($errors->has('judul_hki'))
<label id="login-error" class="text-danger" for="login">{{ $errors->first('judul_hki') }}</label>
@endif
</div>
</div> </div>
</div> <div class="col-md-6">
<div class="col-md-6"> <div class="form-group @if ($errors->has('jenis')) has-error @endif">
<div class="form-group"> <label>Jenis</label>
<label>Jenis</label> <select name="jenis" class="form-control" id="jenis" required>
<select class="form-control" id="jenis"> <option {{ $edit ? ($data->jenis == 'Paten' ? 'selected' : '') : (old('jenis') ? (old('jenis') == 'Paten' ? 'selected' :'') : '') }}>Paten</option>
<option>Paten</option> <option {{ $edit ? ($data->jenis == 'Paten Sederhana' ? 'selected' : '') : (old('jenis') ? (old('jenis') == 'Paten Sederhana' ? 'selected' :'') : '') }}>Paten Sederhana</option>
<option>Paten Sederhana</option> <option {{ $edit ? ($data->jenis == 'Hak Cipta' ? 'selected' : '') : (old('jenis') ? (old('jenis') == 'Hak Cipta' ? 'selected' :'') : '') }}>Hak Cipta</option>
<option>Hak Cipta</option> <option {{ $edit ? ($data->jenis == 'Desain Produksi Industri' ? 'selected' : '') : (old('jenis') ? (old('jenis') == 'Desain Produksi Industri' ? 'selected' :'') : '') }}>Desain Produksi Industri</option>
<option>Desain Produksi Industri</option> <option {{ $edit ? ($data->jenis == 'Perlindungan Varietas Tanaman' ? 'selected' : '') : (old('jenis') ? (old('jenis') == 'Perlindungan Varietas Tanaman' ? 'selected' :'') : '') }}>Perlindungan Varietas Tanaman</option>
<option>Perlindungan Varietas Tanaman</option> <option {{ $edit ? ($data->jenis == 'Desain Tata Letak Sirkuit Terpadu' ? 'selected' : '') : (old('jenis') ? (old('jenis') == 'Desain Tata Letak Sirkuit Terpadu' ? 'selected' :'') : '') }}>Desain Tata Letak Sirkuit Terpadu</option>
<option>Desain Tata Letak Sirkuit Terpadu</option> </select>
</select> @if($errors->has('jenis'))
<label id="login-error" class="text-danger" for="login">{{ $errors->first('jenis') }}</label>
@endif
</div>
</div> </div>
</div> <div class="col-md-6">
<div class="col-md-6"> <div class="form-group @if ($errors->has('status')) has-error @endif">
<div class="form-group"> <label>Status</label>
<label>Status</label> <select name="status" class="form-control" id="status" required>
<select class="form-control" id="status"> <option {{ $edit ? ($data->status == 'Terdaftar' ? 'selected' : '') : (old('status') ? (old('status') == 'Terdaftar' ? 'selected' :'') : '') }}>Terdaftar</option>
<option>Terdaftar</option> <option {{ $edit ? ($data->status == 'Granted/Bersertifikat' ? 'selected' : '') : (old('status') ? (old('status') == 'Granted/Bersertifikat' ? 'selected' :'') : '') }}>Granted/Bersertifikat</option>
<option>Granted/Bersertifikat</option> </select>
</select> @if($errors->has('status'))
<label id="login-error" class="text-danger" for="login">{{ $errors->first('status') }}</label>
@endif
</div>
</div> </div>
</div> <div class="col-md-4">
<div class="col-md-4"> <div class="form-group @if ($errors->has('nopendaftaran')) has-error @endif">
<div class="form-group"> <label>No. Pendaftaran</label>
<label>No. Pendaftaran</label> <input type="text" class="form-control" id="nopendaftaran" value="{{ $edit ? $data->nopendaftaran : old('nopendaftaran') }}" name="nopendaftaran" placeholder="No. Pendaftaran" required>
<input type="text" class="form-control mb-4" id="nopendaftaran" placeholder="No. Pendaftaran"> @if($errors->has('nopendaftaran'))
<label id="login-error" class="text-danger" for="login">{{ $errors->first('nopendaftaran') }}</label>
@endif
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</form> </div>
</div>
</div>
</div> </div>
</div> </div>
</div>
<div class="account-settings-footer"> <div class="account-settings-footer">
<div class="as-footer-container"> <div class="as-footer-container">
<button id="multiple-reset" class="btn btn-warning">Batal</button> <button id="multiple-reset" class="btn btn-warning">Batal</button>
<button id="multiple-messages" class="btn btn-primary">Save Changes</button> <button id="multiple-messages" class="btn btn-primary">Save Changes</button>
</div>
</div> </div>
</div> </form>
</div> </div>
@endsection @endsection
...@@ -113,4 +136,21 @@ ...@@ -113,4 +136,21 @@
@section('js') @section('js')
<script src="{{ url('theme/plugins/apex/apexcharts.min.js') }} "></script> <script src="{{ url('theme/plugins/apex/apexcharts.min.js') }} "></script>
<script src="{{ url('theme/assets/js/dashboard/dash_2.js') }} "></script> <script src="{{ url('theme/assets/js/dashboard/dash_2.js') }} "></script>
<script>
function checkNidn(id){
var value = $('#input_'+id).val();
var request = $.ajax({
url: "{{ route('get-biodata') }}",
type: "get",
dataType: "json",
data: {nidn:value},
success: function(result){
$('#nama_'+id).val(result['name']);
$('#prodi_'+id).val(result['prodi']);
$('#'+id).val(result['nidn']);
}
})
}
</script>
@endsection @endsection
resources/views/user/kekayaan/index.blade.php
...@@ -21,127 +21,30 @@ ...@@ -21,127 +21,30 @@
<table id="zero-config" class="table table-hover" style="width:100%"> <table id="zero-config" class="table table-hover" style="width:100%">
<thead> <thead>
<tr> <tr>
<th>Name</th> <th>Judul</th>
<th>Position</th> <th>Jenis</th>
<th>Office</th> <th>Status</th>
<th>Age</th> <th>No Pendaftaran</th>
<th>Start date</th> <th>Dosen</th>
<th>Salary</th> <th>Aksi</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> @foreach ($data as $item)
<td>Tiger Nixon</td> <tr>
<td>System Architect</td> <td>{{ $item->judul_hki }}</td>
<td>Edinburgh</td> <td>{{ $item->jenis }}</td>
<td>61</td> <td>{{ $item->status }}</td>
<td>2011/04/25</td> <td>{{ $item->nopendaftaran }}</td>
<td>$320,800</td> <td>
</tr> {{ $item->dosen->name }} <br>
<tr> {{ $item->nidn }}
<td>Garrett Winters</td> </td>
<td>Accountant</td> <td>
<td>Tokyo</td> <a class="btn btn-warning" href="{{ route('kekayaanintelek.edit', ['kekayaanintelek' => encrypt($item->id)]) }}"> Edit</a>
<td>63</td> </td>
<td>2011/07/25</td> </tr>
<td>$170,750</td> @endforeach
</tr>
<tr>
<td>Ashton Cox</td>
<td>Junior Technical Author</td>
<td>San Francisco</td>
<td>66</td>
<td>2009/01/12</td>
<td>$86,000</td>
</tr>
<tr>
<td>Cedric Kelly</td>
<td>Senior Javascript Developer</td>
<td>Edinburgh</td>
<td>22</td>
<td>2012/03/29</td>
<td>$433,060</td>
</tr>
<tr>
<td>Airi Satou</td>
<td>Accountant</td>
<td>Tokyo</td>
<td>33</td>
<td>2008/11/28</td>
<td>$162,700</td>
</tr>
<tr>
<td>Brielle Williamson</td>
<td>Integration Specialist</td>
<td>New York</td>
<td>61</td>
<td>2012/12/02</td>
<td>$372,000</td>
</tr>
<tr>
<td>Herrod Chandler</td>
<td>Sales Assistant</td>
<td>San Francisco</td>
<td>59</td>
<td>2012/08/06</td>
<td>$137,500</td>
</tr>
<tr>
<td>Rhona Davidson</td>
<td>Integration Specialist</td>
<td>Tokyo</td>
<td>55</td>
<td>2010/10/14</td>
<td>$327,900</td>
</tr>
<tr>
<td>Colleen Hurst</td>
<td>Javascript Developer</td>
<td>San Francisco</td>
<td>39</td>
<td>2009/09/15</td>
<td>$205,500</td>
</tr>
<tr>
<td>Sonya Frost</td>
<td>Software Engineer</td>
<td>Edinburgh</td>
<td>23</td>
<td>2008/12/13</td>
<td>$103,600</td>
</tr>
<tr>
<td>Jena Gaines</td>
<td>Office Manager</td>
<td>London</td>
<td>30</td>
<td>2008/12/19</td>
<td>$90,560</td>
</tr>
<tr>
<td>Quinn Flynn</td>
<td>Support Lead</td>
<td>Edinburgh</td>
<td>22</td>
<td>2013/03/03</td>
<td>$342,000</td>
</tr>
<tr>
<td>Charde Marshall</td>
<td>Regional Director</td>
<td>San Francisco</td>
<td>36</td>
<td>2008/10/16</td>
<td>$470,600</td>
</tr>
<tr>
<td>Haley Kennedy</td>
<td>Senior Marketing Designer</td>
<td>London</td>
<td>43</td>
<td>2012/12/18</td>
<td>$313,500</td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>
......
resources/views/user/penelitiansumber/create.blade.php
...@@ -283,8 +283,6 @@ ...@@ -283,8 +283,6 @@
$('#nama_'+id).val(result['name']); $('#nama_'+id).val(result['name']);
$('#prodi_'+id).val(result['prodi']); $('#prodi_'+id).val(result['prodi']);
$('#'+id).val(result['nidn']); $('#'+id).val(result['nidn']);
// var r = JSON.parse(result);
// alert(result['name']);
} }
}) })
} }
......
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