diff --git a/app/Http/Controllers/User/FasilitasController.php b/app/Http/Controllers/User/FasilitasController.php
index c509cf3..757c477 100644
--- a/app/Http/Controllers/User/FasilitasController.php
+++ b/app/Http/Controllers/User/FasilitasController.php
@@ -2,7 +2,7 @@
namespace App\Http\Controllers\User;
-use SweetAlert;
+use Alert;
use App\Http\Controllers\Controller;
use App\Repositories\User\FasilitasRepository;
use Crypt;
@@ -64,7 +64,7 @@ class FasilitasController extends Controller
'fasilitas' => $fasilitas->id,
];
- SweetAlert::success('Berhasil', 'Fasilitas berhasil disimpan');
+ Alert::success('Berhasil', 'Fasilitas berhasil disimpan');
return redirect()->route('fasilitas.index', $data);
}
@@ -89,6 +89,16 @@ class FasilitasController extends Controller
public function edit($id)
{
//
+ $menu = 'fasilitas';
+ $fasilitas = $this->fasilitasRepo->findId(null, $id);
+
+ $data = [
+
+ 'menu' => $menu,
+ 'fasilitas' => $fasilitas,
+ ];
+
+ return view('user.fasilitas.edit', $data);
}
/**
@@ -101,6 +111,18 @@ class FasilitasController extends Controller
public function update(Request $request, $id)
{
//
+ $data = $request->except('_token');
+ $data['userid_updated'] = auth()->user()->id;
+ $fasilitas = $this->fasilitasRepo->findId(null, $id);
+ $this->fasilitasRepo->update($data, $fasilitas);
+
+ $data = [
+ 'fasilitas' => $fasilitas->id,
+ ];
+
+ Alert::success('Berhasil', 'Fasilitas berhasil diupdated');
+
+ return redirect()->route('fasilitas.index', $data);
}
/**
@@ -115,7 +137,7 @@ class FasilitasController extends Controller
$model = $this->fasilitasRepo->findId(null, Crypt::decrypt($id));
$this->fasilitasRepo->destroy($model);
- SweetAlert::success('Data berhasil dihapus')->persistent('Ok');
+ Alert::success('Data berhasil dihapus')->persistent('Ok');
return redirect()->route('fasilitas.index');
}
diff --git a/app/Http/Controllers/User/KontrakKerjaController.php b/app/Http/Controllers/User/KontrakKerjaController.php
index 32496f1..acb0981 100644
--- a/app/Http/Controllers/User/KontrakKerjaController.php
+++ b/app/Http/Controllers/User/KontrakKerjaController.php
@@ -84,6 +84,16 @@ class KontrakKerjaController extends Controller
public function edit($id)
{
//
+ $menu = 'kontrakkerja';
+ $kontrakkerja = $this->kontrakkerjaRepo->findId(null, $id);
+
+ $data = [
+
+ 'menu' => $menu,
+ 'kontrakkerja' => $kontrakkerja,
+ ];
+
+ return view('user.kontrakkerja.edit', $data);
}
/**
@@ -96,6 +106,18 @@ class KontrakKerjaController extends Controller
public function update(Request $request, $id)
{
//
+ $data = $request->except('_token');
+ $data['userid_updated'] = auth()->user()->id;
+ $kontrakkerja = $this->kontrakkerjaRepo->findId(null, $id);
+ $this->kontrakkerjaRepo->update($data, $kontrakkerja);
+
+ $data = [
+ 'kontrakkerja' => $kontrakkerja->id,
+ ];
+
+ Alert::success('Berhasil', 'Kontrak Kerja berhasil diupdated');
+
+ return redirect()->route('kontrakkerja.index', $data);
}
/**
diff --git a/app/Http/Controllers/User/PenyelenggaraanSeminarController.php b/app/Http/Controllers/User/PenyelenggaraanSeminarController.php
index 80807ea..b16f9bb 100644
--- a/app/Http/Controllers/User/PenyelenggaraanSeminarController.php
+++ b/app/Http/Controllers/User/PenyelenggaraanSeminarController.php
@@ -83,6 +83,16 @@ class PenyelenggaraanSeminarController extends Controller
public function edit($id)
{
//
+ $menu = 'penyelenggaraseminar';
+ $penyelenggaraseminar = $this->penyelenggaraseminarRepo->findId(null, $id);
+
+ $data = [
+
+ 'menu' => $menu,
+ 'penyelenggaraseminar' => $penyelenggaraseminar,
+ ];
+
+ return view('user.penyelenggara.edit', $data);
}
/**
@@ -95,6 +105,18 @@ class PenyelenggaraanSeminarController extends Controller
public function update(Request $request, $id)
{
//
+ $data = $request->except('_token');
+ $data['userid_updated'] = auth()->user()->id;
+ $penyelenggaraseminar = $this->penyelenggaraseminarRepo->findId(null, $id);
+ $this->penyelenggaraseminarRepo->update($data, $penyelenggaraseminar);
+
+ $data = [
+ 'penyelenggaraseminar' => $penyelenggaraseminar->id,
+ ];
+
+ Alert::success('Berhasil', 'penyelenggaraseminar berhasil diupdated');
+
+ return redirect()->route('penyelenggaraseminar.index', $data);
}
/**
diff --git a/app/Http/Controllers/User/StafPendukungController.php b/app/Http/Controllers/User/StafPendukungController.php
index c198c56..7c31424 100644
--- a/app/Http/Controllers/User/StafPendukungController.php
+++ b/app/Http/Controllers/User/StafPendukungController.php
@@ -5,22 +5,35 @@ namespace App\Http\Controllers\User;
use Alert;
use App\Http\Controllers\Controller;
use App\Repositories\User\StafPendukungRepository;
+use App\Repositories\Admin\MsTingkatPendidikanRepository;
+use App\Repositories\Admin\MsUnitKerjaRepository;
+use App\Repositories\Admin\MsJabatanRepository;
use Crypt;
use Illuminate\Http\Request;
class StafPendukungController extends Controller
{
private $stafpendukungRepo;
-
- public function __construct(StafPendukungRepository $stafpendukungRepo)
- {
+ private $msunitkerjaRepo;
+ private $mstingkatpendidikanRepo;
+ private $msjabatanRepo;
+
+ public function __construct(
+ StafPendukungRepository $stafpendukungRepo,
+ MsUnitKerjaRepository $msunitkerjaRepo,
+ MsTingkatPendidikanRepository $mstingkatpendidikanRepo,
+ MsJabatanRepository $msjabatanRepo
+ ){
$this->stafpendukungRepo = $stafpendukungRepo;
+ $this->msunitkerjaRepo = $msunitkerjaRepo;
+ $this->mstingkatpendidikanRepo = $mstingkatpendidikanRepo;
+ $this->msjabatanRepo = $msjabatanRepo;
}
public function index()
{
//
$menu = 'stafpendukung';
- $stafpendukung = $this->stafpendukungRepo->get();
+ $stafpendukung = $this->stafpendukungRepo->get(['rUnitkerja','rTingkatpendidikan','rJabatan']);
$data = [
'stafpendukung' => $stafpendukung,
@@ -38,7 +51,19 @@ class StafPendukungController extends Controller
public function create()
{
//
- return view('user.stafpendukung.create');
+ $menu='stafpendukung';
+ $unitkerja = $this->msunitkerjaRepo->get()->pluck('nama', 'kode');
+ $tingkatpendidikan = $this->mstingkatpendidikanRepo->get()->pluck('nama', 'kode');
+ $jabatan = $this->msjabatanRepo->get()->pluck('nama', 'kode');
+ // dd($unitkerja);
+ $data = [
+ 'unitkerja' => $unitkerja,
+ 'tingkatpendidikan' => $tingkatpendidikan,
+ 'jabatan' => $jabatan,
+ 'menu' => $menu
+ ];
+
+ return view('user.stafpendukung.create', $data);
}
/**
@@ -83,6 +108,22 @@ class StafPendukungController extends Controller
public function edit($id)
{
//
+ $menu = 'stafpendukung';
+ $unitkerja = $this->msunitkerjaRepo->get()->pluck('nama', 'kode');
+ $tingkatpendidikan = $this->mstingkatpendidikanRepo->get()->pluck('nama', 'kode');
+ $jabatan = $this->msjabatanRepo->get()->pluck('nama', 'kode');
+ $stafpendukung = $this->stafpendukungRepo->findId(null, $id);
+
+ $data = [
+
+ 'menu' => $menu,
+ 'unitkerja' => $unitkerja,
+ 'tingkatpendidikan' => $tingkatpendidikan,
+ 'jabatan' => $jabatan,
+ 'stafpendukung' => $stafpendukung,
+ ];
+
+ return view('user.stafpendukung.edit', $data);
}
/**
@@ -95,6 +136,18 @@ class StafPendukungController extends Controller
public function update(Request $request, $id)
{
//
+ $data = $request->except('_token');
+ $data['userid_updated'] = auth()->user()->id;
+ $stafpendukung = $this->stafpendukungRepo->findId(null, $id);
+ $this->stafpendukungRepo->update($data, $stafpendukung);
+
+ $data = [
+ 'stafpendukung' => $stafpendukung->id,
+ ];
+
+ Alert::success('Berhasil', 'Staf Pendukung berhasil diupdated');
+
+ return redirect()->route('stafpendukung.index', $data);
}
/**
diff --git a/app/Http/Controllers/User/UnitBisnisController.php b/app/Http/Controllers/User/UnitBisnisController.php
index 987b2a7..0ae2d77 100644
--- a/app/Http/Controllers/User/UnitBisnisController.php
+++ b/app/Http/Controllers/User/UnitBisnisController.php
@@ -83,6 +83,16 @@ class UnitBisnisController extends Controller
public function edit($id)
{
//
+ $menu = 'unitbisnis';
+ $unitbisnis = $this->unitbisnisRepo->findId(null, $id);
+
+ $data = [
+
+ 'menu' => $menu,
+ 'unitbisnis' => $unitbisnis,
+ ];
+
+ return view('user.unitbisnis.edit', $data);
}
/**
@@ -95,6 +105,18 @@ class UnitBisnisController extends Controller
public function update(Request $request, $id)
{
//
+ $data = $request->except('_token');
+ $data['userid_updated'] = auth()->user()->id;
+ $unitbisnis = $this->unitbisnisRepo->findId(null, $id);
+ $this->unitbisnisRepo->update($data, $unitbisnis);
+
+ $data = [
+ 'unitbisnis' => $unitbisnis->id,
+ ];
+
+ Alert::success('Berhasil', 'Unit Bisnis berhasil diupdated');
+
+ return redirect()->route('unitbisnis.index', $data);
}
/**
diff --git a/app/Models/Admin/MsJabatan.php b/app/Models/Admin/MsJabatan.php
new file mode 100644
index 0000000..c8ec304
--- /dev/null
+++ b/app/Models/Admin/MsJabatan.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Models\Admin;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class MsJabatan extends Model
+{
+ use HasFactory;
+ public $incrementing = false;
+ protected $table = 'ms_jabatan';
+ protected $keyType = 'string';
+}
diff --git a/app/Models/Admin/MsTingkatPendidikan.php b/app/Models/Admin/MsTingkatPendidikan.php
new file mode 100644
index 0000000..8495f6b
--- /dev/null
+++ b/app/Models/Admin/MsTingkatPendidikan.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Models\Admin;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class MsTingkatPendidikan extends Model
+{
+ use HasFactory;
+ public $incrementing = false;
+ protected $table = 'ms_tingkatpendidikan';
+ protected $keyType = 'string';
+}
diff --git a/app/Models/Admin/MsUnitKerja.php b/app/Models/Admin/MsUnitKerja.php
new file mode 100644
index 0000000..e99d59a
--- /dev/null
+++ b/app/Models/Admin/MsUnitKerja.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Models\Admin;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class MsUnitKerja extends Model
+{
+ use HasFactory;
+ public $incrementing = false;
+ protected $table = 'ms_unitkerja';
+ protected $keyType = 'string';
+}
diff --git a/app/Models/User/StafPendukung.php b/app/Models/User/StafPendukung.php
index a172111..fb3c245 100644
--- a/app/Models/User/StafPendukung.php
+++ b/app/Models/User/StafPendukung.php
@@ -5,6 +5,9 @@ namespace App\Models\User;
use App\Traits\UuidTrait;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
+use App\Models\Admin\MsUnitKerja;
+use App\Models\Admin\MsTingkatPendidikan;
+use App\Models\Admin\MsJabatan;
class StafPendukung extends Model
{
@@ -18,4 +21,19 @@ class StafPendukung extends Model
protected $fillable = [
'id', 'nip', 'nama', 'sex', 'jabatan', 'unit_kerja', 'tingkat_pendidikan', 'userid_created', 'userid_updated', 'created_at', 'updated_at',
];
+
+ public function rUnitkerja()
+ {
+ return $this->belongsTo(MsUnitKerja::class, 'unit_kerja', 'kode');
+ }
+
+ public function rTingkatpendidikan()
+ {
+ return $this->belongsTo(MsTingkatPendidikan::class, 'tingkat_pendidikan', 'kode');
+ }
+
+ public function rJabatan()
+ {
+ return $this->belongsTo(MsJabatan::class, 'jabatan', 'kode');
+ }
}
diff --git a/app/Repositories/Admin/MsJabatanRepository.php b/app/Repositories/Admin/MsJabatanRepository.php
new file mode 100644
index 0000000..c97bf6e
--- /dev/null
+++ b/app/Repositories/Admin/MsJabatanRepository.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Repositories\Admin;
+
+use App\Models\Admin\MsJabatan;
+use App\Repositories\Repository;
+
+class MsJabatanRepository extends Repository
+{
+ protected $model;
+
+ public function __construct(MsJabatan $model)
+ {
+ $this->model = $model;
+ }
+
+ public function get($with = null, $search = null, $id = null)
+ {
+ return $this->model->when($with, function ($query) use ($with) {
+ return $query->with($with);
+ })
+ ->when($search, function ($query) use ($search) {
+ return $query->where('search', $search);
+ })
+ ->when($id, function ($query) use ($id) {
+ return $query->where('id', $id);
+ })
+ ->get();
+ }
+}
diff --git a/app/Repositories/Admin/MsTingkatPendidikanRepository.php b/app/Repositories/Admin/MsTingkatPendidikanRepository.php
new file mode 100644
index 0000000..37731d0
--- /dev/null
+++ b/app/Repositories/Admin/MsTingkatPendidikanRepository.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Repositories\Admin;
+
+use App\Models\Admin\MsTingkatPendidikan;
+use App\Repositories\Repository;
+
+class MsTingkatPendidikanRepository extends Repository
+{
+ protected $model;
+
+ public function __construct(MsTingkatPendidikan $model)
+ {
+ $this->model = $model;
+ }
+
+ public function get($with = null, $search = null, $id = null)
+ {
+ return $this->model->when($with, function ($query) use ($with) {
+ return $query->with($with);
+ })
+ ->when($search, function ($query) use ($search) {
+ return $query->where('search', $search);
+ })
+ ->when($id, function ($query) use ($id) {
+ return $query->where('id', $id);
+ })
+ ->get();
+ }
+}
diff --git a/app/Repositories/Admin/MsUnitKerjaRepository.php b/app/Repositories/Admin/MsUnitKerjaRepository.php
new file mode 100644
index 0000000..fa0ada1
--- /dev/null
+++ b/app/Repositories/Admin/MsUnitKerjaRepository.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Repositories\Admin;
+
+use App\Models\Admin\MsUnitKerja;
+use App\Repositories\Repository;
+
+class MsUnitKerjaRepository extends Repository
+{
+ protected $model;
+
+ public function __construct(MsUnitKerja $model)
+ {
+ $this->model = $model;
+ }
+
+ public function get($with = null, $search = null, $id = null)
+ {
+ return $this->model->when($with, function ($query) use ($with) {
+ return $query->with($with);
+ })
+ ->when($search, function ($query) use ($search) {
+ return $query->where('search', $search);
+ })
+ ->when($id, function ($query) use ($id) {
+ return $query->where('id', $id);
+ })
+ ->get();
+ }
+}
diff --git a/resources/views/user/fasilitas/edit.blade.php b/resources/views/user/fasilitas/edit.blade.php
index 2a866b9..2f89e30 100644
--- a/resources/views/user/fasilitas/edit.blade.php
+++ b/resources/views/user/fasilitas/edit.blade.php
@@ -21,7 +21,7 @@
<div class="row">
<div class="col-xl-12 col-lg-12 col-md-12 layout-spacing">
- {{ Form::open(['url' => route('fasilitas.store'), 'method' => 'post', 'class' => 'section general-info', 'id' => 'fasilitas']) }}
+ {!! Form::model($fasilitas, ['route' => ['fasilitas.update', $fasilitas->id], 'method'=>'patch', 'class' => 'section general-info']) !!}
<meta name="csrf-token" content="{{ csrf_token() }}">
<div class="info">
<h5 class="">Data Unit Fasilitas dan Peralatan Utama Penelitian</h5>
@@ -31,22 +31,23 @@
<div class="col-md-6">
<div class="form-group">
<label>Nama Unit</label>
- <input type="text" class="form-control mb-4" id="namaunit" name="namaunit" placeholder="Nama Unit">
+ <input type="text" class="form-control mb-4" id="namaunit" name="namaunit" value="{{$fasilitas->namaunit}}">
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label>No. SK Penetapan Pendirian</label>
- <input type="text" class="form-control mb-4" id="nosk" name="nosk" placeholder="No. SK Penetapan Pendirian">
+ <input type="text" class="form-control mb-4" id="nosk" name="nosk" value="{{$fasilitas->nosk}}">
</div>
</div>
+ @php $status = array("Belum Terakreditasi / Tersertifikasi" => "Belum Terakreditasi / Tersertifikasi", "Terakreditasi" => "Terakreditasi", "Tersertifikasi" => "Tersertifikasi"); @endphp
<div class="col-md-4">
<div class="form-group">
<label>Status</label>
<select class="form-control" id="status" name="status">
- <option value="Belum Terakreditasi / Tersertifikasi">Belum Terakreditasi / Tersertifikasi</option>
- <option value="Terakreditasi">Terakreditasi</option>
- <option value="Tersertifikasi">Tersertifikasi</option>
+ @foreach($status as $item)
+ <option value="{{$item}}" {{ ( $fasilitas->status == $item) ? 'selected' : '' }}>{{$item}}</option>
+ @endforeach
</select>
</div>
</div>
@@ -55,15 +56,15 @@
<div class="col-md-12">
<div class="form-group">
<label>Fasilitas & Peralatan Utama</label>
- <textarea class="form-control" id="fasilitas" name="fasilitas" placeholder="Fasilitas & Peralatan Utama" rows="5"></textarea>
+ <textarea class="form-control" id="fasilitas" name="fasilitas" placeholder="Fasilitas & Peralatan Utama" rows="5">{{$fasilitas->fasilitas}}</textarea>
</div>
</div>
<div class="col-md-4">
<div class="form-group">
<label>Status Aktif</label>
<select class="form-control" id="status_aktif" name="status_aktif">
- <option value="1">Aktif</option>
- <option value="0">Tidak Aktif</option>
+ <option value="1" {{ ( $fasilitas->status_aktif == 1) ? 'selected' : '' }}>Aktif</option>
+ <option value="0" {{ ( $fasilitas->status_aktif == 0) ? 'selected' : '' }}>Tidak Aktif</option>
</select>
</div>
</div>
diff --git a/resources/views/user/kekayaan/index.blade.php b/resources/views/user/kekayaan/index.blade.php
index 2af450a..ab9f984 100644
--- a/resources/views/user/kekayaan/index.blade.php
+++ b/resources/views/user/kekayaan/index.blade.php
@@ -18,6 +18,7 @@
<div class="col-xl-12 col-lg-12 col-sm-12 layout-spacing">
<div class="widget-content widget-content-area br-6">
<div class="table-responsive mb-4 mt-4">
+ <a href="{{ url('kekayaanintelek/create') }}" class="btn btn-primary mb-2"><i data-feather="file-plus"></i> Tambah</a>
<table id="zero-config" class="table table-hover" style="width:100%">
<thead>
<tr>
diff --git a/resources/views/user/kontrakkerja/edit.blade.php b/resources/views/user/kontrakkerja/edit.blade.php
new file mode 100644
index 0000000..6dd7f3e
--- /dev/null
+++ b/resources/views/user/kontrakkerja/edit.blade.php
@@ -0,0 +1,85 @@
+@extends('layouts.master')
+
+@section('title')
+ Kontrak Kerja Non Penelitian
+@endsection
+
+@section('header')
+<div class="page-title">
+ <h3>Kontrak Kerja Non Penelitian</h3>
+</div>
+@endsection
+
+@section('contents')
+@php
+ $menu = 'dashboard';
+@endphp
+ <div class="account-settings-container layout-top-spacing">
+ {!! Form::model($kontrakkerja, ['route' => ['kontrakkerja.update', $kontrakkerja->id], 'method'=>'patch', 'class' => 'section general-info']) !!}
+ <div class="account-content">
+ <div class="scrollspy-example" data-spy="scroll" data-target="#account-settings-scroll" data-offset="-100">
+ <div class="row">
+
+ <div class="col-xl-12 col-lg-12 col-md-12 layout-spacing">
+ <div class="info">
+ <h5 class="">Data Kegiatan Kontrak Kerja Non Penelitian</h5>
+ <div class="row">
+ <div class="col-md-11 mx-auto">
+ <div class="row">
+ <div class="col-md-6">
+ <div class="form-group">
+ <label>Unit Pelaksanaan</label>
+ <input type="text" class="form-control mb-4" id="unit_pelaksanaan" name="unit_pelaksanaan" placeholder="Unit Pelaksanaan" value="{{$kontrakkerja->unit_pelaksanaan}}">
+ </div>
+ </div>
+ <div class="col-md-12">
+ <div class="form-group">
+ <label>Nama Kegiatan</label>
+ <textarea class="form-control" id="nama_kegiatan" name="nama_kegiatan" placeholder="Nama Kegiatan" rows="2">{{$kontrakkerja->nama_kegiatan}}</textarea>
+ </div>
+ </div>
+ <div class="col-md-6">
+ <div class="form-group">
+ <label>Institusi Mitra</label>
+ <input type="text" class="form-control mb-4" id="institusi_mitra" name="institusi_mitra" placeholder="Institusi Mitra" value="{{$kontrakkerja->institusi_mitra}}">
+ <small class="form-text text-muted">Diperbolehkan lebih dari satu mitra dipisahkan dengan koma (,)</small>
+ </div>
+ </div>
+ <div class="col-md-6">
+ <div class="form-group">
+ <label>Nomor Kontrak</label>
+ <input type="text" class="form-control mb-4" id="nokontrak" name="nokontrak" placeholder="Nomor Kontrak" value="{{$kontrakkerja->nokontrak}}">
+ </div>
+ </div>
+ <div class="col-md-6">
+ <div class="form-group">
+ <label>Nilai Kontrak</label>
+ <input type="text" class="form-control mb-4" id="nilaikontrak" name="nilaikontrak" placeholder="Nilai Kontrak" value="{{$kontrakkerja->nilaikontrak}}">
+ <small class="form-text text-muted">Nilai Kontrak dalam Rupiah</small>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+
+ <div class="account-settings-footer">
+ <div class="as-footer-container">
+ <button id="multiple-reset" class="btn btn-warning">Batal</button>
+ <button type="submit" id="multiple-messages" class="btn btn-primary">Save Changes</button>
+ </div>
+ </div>
+ {{ Form::close() }}
+ </div>
+
+@endsection
+
+@section('js')
+ <script src="{{ url('theme/plugins/apex/apexcharts.min.js') }} "></script>
+ <script src="{{ url('theme/assets/js/dashboard/dash_2.js') }} "></script>
+@endsection
diff --git a/resources/views/user/penyelenggara/create.blade.php b/resources/views/user/penyelenggara/create.blade.php
index f001447..70901f5 100644
--- a/resources/views/user/penyelenggara/create.blade.php
+++ b/resources/views/user/penyelenggara/create.blade.php
@@ -44,13 +44,14 @@
<input type="text" class="form-control mb-4" id="mitra" name="mitra" placeholder="Mitra Conference">
</div>
</div>
+ @php $skala = array('Tingkat Internasional' => 'Tingkat Internasional', 'Tingkat Nasional'=>'Tingkat Nasional', 'Regional'=>'Regional'); @endphp
<div class="col-md-4">
<div class="form-group">
<label>Skala Conference</label>
<select class="form-control" id="skala" name="skala">
- <option value="Tingkat Internasional">Tingkat Internasional</option>
- <option value="Tingkat Nasional">Tingkat Nasional</option>
- <option value="Regional">Regional</option>
+ @foreach($skala as $item)
+ <option value="{{$item}}">{{$item}}</option>
+ @endforeach
</select>
</div>
</div>
@@ -81,13 +82,13 @@
<div class="col-md-6">
<div class="form-group">
<label>Tempat Pelaksanaan</label>
- <input type="text" class="form-control mb-4" id="tempat" placeholder="Tempat Pelaksanaan">
+ <input type="text" class="form-control mb-4" id="tempat" name="tempat" placeholder="Tempat Pelaksanaan">
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label>URL Conference</label>
- <input type="text" class="form-control mb-4" id="url" placeholder="URL Conference">
+ <input type="text" class="form-control mb-4" id="url" name="url" placeholder="URL Conference">
</div>
</div>
</div>
diff --git a/resources/views/user/penyelenggara/edit.blade.php b/resources/views/user/penyelenggara/edit.blade.php
new file mode 100644
index 0000000..a0355eb
--- /dev/null
+++ b/resources/views/user/penyelenggara/edit.blade.php
@@ -0,0 +1,129 @@
+@extends('layouts.master')
+
+@section('title')
+ Penyelenggaraan Seminar/Conference
+@endsection
+
+@section('header')
+<div class="page-title">
+ <h3>Penyelenggaraan Seminar/Conference</h3>
+</div>
+@endsection
+
+@section('contents')
+@php
+ $menu = 'dashboard';
+@endphp
+ <div class="account-settings-container layout-top-spacing">
+ {!! Form::model($penyelenggaraseminar, ['route' => ['penyelenggaraseminar.update', $penyelenggaraseminar->id], 'method'=>'patch', 'class' => 'section general-info']) !!}
+ <div class="account-content">
+ <div class="scrollspy-example" data-spy="scroll" data-target="#account-settings-scroll" data-offset="-100">
+ <div class="row">
+
+ <div class="col-xl-12 col-lg-12 col-md-12 layout-spacing">
+ <div class="info">
+ <h5 class="">Data Penyelenggaraan Seminar/Conference</h5>
+ <div class="row">
+ <div class="col-md-11 mx-auto">
+ <div class="row">
+ <div class="col-md-12">
+ <div class="form-group">
+ <label>Nama Seminar Conference</label>
+ <textarea class="form-control" id="nama_seminar" name="nama_seminar" placeholder="Nama Seminar Conference" rows="2">{{$penyelenggaraseminar->nama_seminar}}</textarea>
+ </div>
+ </div>
+ <div class="col-md-6">
+ <div class="form-group">
+ <label>Unit Pelaksanaan</label>
+ <input type="text" class="form-control mb-4" id="unit_pelaksana" name="unit_pelaksana" placeholder="Unit Pelaksanaan" value="{{$penyelenggaraseminar->unit_pelaksana}}">
+ </div>
+ </div>
+ <div class="col-md-6">
+ <div class="form-group">
+ <label>Mitra Conference</label>
+ <input type="text" class="form-control mb-4" id="mitra" name="mitra" placeholder="Mitra Conference" value="{{$penyelenggaraseminar->mitra}}">
+ </div>
+ </div>
+ @php $skala = array('Tingkat Internasional' => 'Tingkat Internasional', 'Tingkat Nasional'=>'Tingkat Nasional', 'Regional'=>'Regional'); @endphp
+ <div class="col-md-4">
+ <div class="form-group">
+ <label>Skala Conference</label>
+ <select class="form-control" id="skala" name="skala">
+ @foreach($skala as $item)
+ <option value="{{$item}}" {{ ( $penyelenggaraseminar->status == $item) ? 'selected' : '' }}>{{$item}}</option>
+ @endforeach
+ </select>
+ </div>
+ </div>
+ <div class="col-md-6">
+ </div>
+ <div class="col-md-6">
+ <label for="date">Waktu Pelaksanaan</label>
+ <div class="row">
+ <div class="col-xl-5">
+ <div class="form-group">
+ <input id="dateAwal" type="text" class="form-control flatpickr flatpickr-input active" name="waktu_pelaksanaan_awal" value="{{$penyelenggaraseminar->waktu_pelaksanaan_awal}}">
+ </div>
+ </div>
+ <div class="col-xl-1">
+ <div class="form-group">
+ <label for="date2">s/d</label>
+ </div>
+ </div>
+ <div class="col-xl-5">
+ <div class="form-group">
+ <input id="dateAkhir" type="text" class="form-control flatpickr flatpickr-input active" name="waktu_pelaksanaan_akhir" value="{{$penyelenggaraseminar->waktu_pelaksanaan_akhir}}">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="col-md-6">
+ </div>
+ <div class="col-md-6">
+ <div class="form-group">
+ <label>Tempat Pelaksanaan</label>
+ <input type="text" class="form-control mb-4" id="tempat" placeholder="Tempat Pelaksanaan" name="tempat" value="{{$penyelenggaraseminar->tempat}}">
+ </div>
+ </div>
+ <div class="col-md-6">
+ <div class="form-group">
+ <label>URL Conference</label>
+ <input type="text" class="form-control mb-4" id="url" placeholder="URL Conference" name="url" value="{{$penyelenggaraseminar->url}}">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+
+ <div class="account-settings-footer">
+ <div class="as-footer-container">
+ <button id="multiple-reset" class="btn btn-warning">Batal</button>
+ <button id="multiple-messages" class="btn btn-primary">Save Changes</button>
+ </div>
+ </div>
+ {{ Form::close() }}
+ </div>
+
+@endsection
+
+@section('js')
+ <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/scrollspyNav.js') }}"></script>
+ <script src="{{ url('theme/plugins/flatpickr/flatpickr.js') }}"></script>
+ <script src="{{ url('theme/plugins/noUiSlider/nouislider.min.js') }}"></script>
+
+ <script>
+ var f1 = flatpickr(document.getElementById('dateAwal'));
+ var f2 = flatpickr(document.getElementById('dateAkhir'));
+ </script>
+ <script src="{{ url('theme/plugins/noUiSlider/custom-nouiSlider.js') }}"></script>
+ <script src="{{ url('theme/plugins/bootstrap-range-Slider/bootstrap-rangeSlider.js') }}"></script>
+@endsection
diff --git a/resources/views/user/stafpendukung/create.blade.php b/resources/views/user/stafpendukung/create.blade.php
index 7f8b9a6..1758f4d 100644
--- a/resources/views/user/stafpendukung/create.blade.php
+++ b/resources/views/user/stafpendukung/create.blade.php
@@ -51,8 +51,9 @@
<div class="form-group">
<label>Jabatan</label>
<select class="form-control" id="jabatan" name="jabatan">
- <option value="Administrasi">Administrasi</option>
- <option value="Teknisi">Teknisi</option>
+ @foreach($jabatan as $kode=>$nama)
+ <option value="{{$kode}}">{{$nama}}</option>
+ @endforeach
</select>
</div>
</div>
@@ -60,13 +61,9 @@
<div class="form-group">
<label>Unit Kerja</label>
<select class="form-control" id="unit_kerja" name="unit_kerja">
- <option value="U1">Fakultas Bidang Humaniora (IPSK)</option>
- <option value="U2">Fakultas Bidang Kesehatan & Kedokteran</option>
- <option value="U3">Fakultas Bidang MIPA</option>
- <option value="U4">Fakultas Bidang Pertanian</option>
- <option value="U5">Fakultas Bidang Teknik</option>
- <option value="U6">Lembaga Penelitian (Lemlit) / LPPM</option>
- <option value="U7">Unit Pelayanan Teknik (UPT)</option>
+ @foreach($unitkerja as $kode=>$nama)
+ <option value="{{$kode}}">{{$nama}}</option>
+ @endforeach
</select>
</div>
</div>
@@ -74,13 +71,9 @@
<div class="form-group">
<label>Tingkat Pendidikan</label>
<select class="form-control" id="tingkat_pendidikan" name="tingkat_pendidikan">
- <option value="TP1">D1</option>
- <option value="TP2">D2</option>
- <option value="TP3">D3</option>
- <option value="TP4">D4</option>
- <option value="TP5">S1</option>
- <option value="TP6">S2</option>
- <option value="TP8">Non Pendidikan Tinggi</option>
+ @foreach($tingkatpendidikan as $kode=>$nama)
+ <option value="{{$kode}}">{{$nama}}</option>
+ @endforeach
</select>
</div>
</div>
diff --git a/resources/views/user/stafpendukung/edit.blade.php b/resources/views/user/stafpendukung/edit.blade.php
new file mode 100644
index 0000000..2850e5e
--- /dev/null
+++ b/resources/views/user/stafpendukung/edit.blade.php
@@ -0,0 +1,104 @@
+@extends('layouts.master')
+
+@section('title')
+ Staf Pendukung Penelitian
+@endsection
+
+@section('header')
+<div class="page-title">
+ <h3>Staf Pendukung Penelitian</h3>
+</div>
+@endsection
+
+@section('contents')
+@php
+ $menu = 'dashboard';
+@endphp
+ <div class="account-settings-container layout-top-spacing">
+ {!! Form::model($stafpendukung, ['route' => ['stafpendukung.update', $stafpendukung->id], 'method'=>'patch', 'class' => 'section general-info']) !!}
+ <div class="account-content">
+ <div class="scrollspy-example" data-spy="scroll" data-target="#account-settings-scroll" data-offset="-100">
+ <div class="row">
+
+ <div class="col-xl-12 col-lg-12 col-md-12 layout-spacing">
+ <div class="info">
+ <h5 class="">Data Staf Pendukung</h5>
+ <div class="row">
+ <div class="col-md-11 mx-auto">
+ <div class="row">
+ <div class="col-md-6">
+ <div class="form-group">
+ <label>NIP / NIK</label>
+ <input type="text" class="form-control mb-4" id="nip" name="nip" value="{{$stafpendukung->nip}}">
+ </div>
+ </div>
+ <div class="col-md-6">
+ <div class="form-group">
+ <label>Nama Lengkap dan Gelar</label>
+ <input type="text" class="form-control mb-4" id="nama" name="nama" value="{{$stafpendukung->nama}}">
+ </div>
+ </div>
+ <div class="col-md-4">
+ <div class="form-group">
+ <label>Jenis Kelamin</label>
+ <select class="form-control" id="sex" name="sex">
+ <option value="L" {{ ( $stafpendukung->status_aktif == 'L') ? 'selected' : '' }}>Laki-Laki</option>
+ <option value="P" {{ ( $stafpendukung->status_aktif == 'P') ? 'selected' : '' }}>Perempuan</option>
+ </select>
+ </div>
+ </div>
+ <div class="col-md-4">
+ <div class="form-group">
+ <label>Jabatan</label>
+ <select class="form-control" id="jabatan" name="jabatan">
+ @foreach($jabatan as $kode=>$nama)
+ <option value="{{$kode}}" {{ ( $stafpendukung->jabatan == $kode) ? 'selected' : '' }}>{{$nama}}</option>
+ @endforeach
+ </select>
+ </div>
+ </div>
+ <div class="col-md-6">
+ <div class="form-group">
+ <label>Unit Kerja</label>
+ <select class="form-control" id="unit_kerja" name="unit_kerja">
+ @foreach($unitkerja as $kode=>$nama)
+ <option value="{{$kode}}" {{ ( $stafpendukung->unit_kerja == $kode) ? 'selected' : '' }}>{{$nama}}</option>
+ @endforeach
+ </select>
+ </div>
+ </div>
+ <div class="col-md-6">
+ <div class="form-group">
+ <label>Tingkat Pendidikan</label>
+ <select class="form-control" id="tingkat_pendidikan" name="tingkat_pendidikan">
+ @foreach($tingkatpendidikan as $kode=>$nama)
+ <option value="{{$kode}}" {{ ( $stafpendukung->tingkat_pendidikan == $kode) ? 'selected' : '' }}>{{$nama}}</option>
+ @endforeach
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+
+ <div class="account-settings-footer">
+ <div class="as-footer-container">
+ <button id="multiple-reset" class="btn btn-warning">Batal</button>
+ <button type="submit" id="multiple-messages" class="btn btn-primary">Save Changes</button>
+ </div>
+ </div>
+ {{ Form::close() }}
+ </div>
+
+@endsection
+
+@section('js')
+ <script src="{{ url('theme/plugins/apex/apexcharts.min.js') }} "></script>
+ <script src="{{ url('theme/assets/js/dashboard/dash_2.js') }} "></script>
+@endsection
diff --git a/resources/views/user/stafpendukung/index.blade.php b/resources/views/user/stafpendukung/index.blade.php
index e166d4c..d156860 100644
--- a/resources/views/user/stafpendukung/index.blade.php
+++ b/resources/views/user/stafpendukung/index.blade.php
@@ -28,7 +28,7 @@
<th>Jabatan</th>
<th>Unit Kerja</th>
<th>Tingkat Pendidikan</th>
- <th>Aksi</th>
+ <th width="20%">Aksi</th>
</tr>
</thead>
<tbody>
@@ -36,11 +36,11 @@
@foreach ($stafpendukung as $value)
<tr>
<td>{{$no++}}</td>
- <td>{{$value->nip}}</td>
- <td>{{$value->nama}}</td>
+ <td>{{$value->nip}}<br>{{$value->nama}}</td>
<td>{{$value->sex}}</td>
- <td>{{$value->jabatan}}</td>
- <td>{{$value->unit_kerja}}</td>
+ <td>{{$value->rJabatan->nama}}</td>
+ <td>{{$value->rUnitkerja->nama}}</td>
+ <td>{{$value->rTingkatpendidikan->nama}}</td>
<td>
<a href="{{ url('stafpendukung/'.$value->id.'/edit') }}" class="btn btn-warning mb-2"><i data-feather="edit"></i> Edit</a> |
<button class="btn btn-danger mb-2 delete" data-id="{{ $value->id }}" data-file="{{$value->id}}"><i data-feather="trash-2"></i> Delete</button>
diff --git a/resources/views/user/unitbisnis/edit.blade.php b/resources/views/user/unitbisnis/edit.blade.php
new file mode 100644
index 0000000..94cb817
--- /dev/null
+++ b/resources/views/user/unitbisnis/edit.blade.php
@@ -0,0 +1,94 @@
+@extends('layouts.master')
+
+@section('title')
+ Unit Bisnis Hasil Riset
+@endsection
+
+@section('header')
+<div class="page-title">
+ <h3>Unit Bisnis Hasil Riset</h3>
+</div>
+@endsection
+
+@section('contents')
+@php
+ $menu = 'dashboard';
+@endphp
+ <div class="account-settings-container layout-top-spacing">
+ {!! Form::model($unitbisnis, ['route' => ['unitbisnis.update', $unitbisnis->id], 'method'=>'patch', 'class' => 'section general-info']) !!}
+ <div class="account-content">
+ <div class="scrollspy-example" data-spy="scroll" data-target="#account-settings-scroll" data-offset="-100">
+ <div class="row">
+ <div class="col-xl-12 col-lg-12 col-md-12 layout-spacing">
+ <div class="info">
+ <h5 class="">Data Unit Bisnis Hasil Riset</h5>
+ <div class="row">
+ <div class="col-md-11 mx-auto">
+ <div class="row">
+ <div class="col-md-6">
+ <div class="form-group">
+ <label>Nama Unit Bisnis</label>
+ <input type="text" class="form-control mb-4" id="nama_unit" name="nama_unit" placeholder="Nama Unit Bisnis" value="{{$unitbisnis->nama_unit}}">
+ </div>
+ </div>
+ <div class="col-md-6">
+ <div class="form-group">
+ <label>No. SK Pendirian</label>
+ <input type="text" class="form-control mb-4" id="nosk" name="nosk" placeholder="No. SK Pendirian" value="{{$unitbisnis->nosk}}">
+ </div>
+ </div>
+ <div class="col-md-12">
+ <div class="form-group">
+ <label>Lingkup Kegiatan</label>
+ <textarea class="form-control" id="lingkup_kegiatan" name="lingkup_kegiatan" placeholder="Lingkup Kegiatan" rows="3">{{$unitbisnis->lingkup_kegiatan}}</textarea>
+ </div>
+ </div>
+ <div class="col-md-6">
+ <div class="form-group">
+ <label>Mitra Bisnis</label>
+ <input type="text" class="form-control mb-4" id="mitra" name="mitra" placeholder="Mitra Bisnis" value="{{$unitbisnis->mitra}}">
+ </div>
+ </div>
+ <div class="col-md-6">
+ </div>
+ <div class="col-md-8">
+ <label>Pendapatan</label>
+ <div class="row">
+ <div class="col-xl-6">
+ <div class="form-group">
+ <label> {{$unitbisnis->pendapatan_tahun}} </label>
+ <input type="hidden" class="form-control mb-4" id="pendapatan_tahun" name="pendapatan_tahun" value="{{$unitbisnis->pendapatan_tahun}}">
+ <input type="text" class="form-control mb-4" id="pendapatan" name="pendapatan" placeholder="{{$unitbisnis->pendapatan}}">
+ </div>
+ </div>
+ <div class="col-xl-6">
+ <div class="form-group">
+ <label> {{$unitbisnis->pendapatan_tahun2}} </label>
+ <input type="hidden" class="form-control mb-4" id="pendapatan_tahun2" name="pendapatan_tahun2" value="{{$unitbisnis->pendapatan_tahun2}}">
+ <input type="text" class="form-control mb-4" id="pendapatan2" name="pendapatan2" placeholder="{{$unitbisnis->pendapatan2}}">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="account-settings-footer">
+ <div class="as-footer-container">
+ <button id="multiple-reset" class="btn btn-warning">Batal</button>
+ <button type="submit" id="multiple-messages" class="btn btn-primary">Save Changes</button>
+ </div>
+ </div>
+ {{ Form::close() }}
+ </div>
+
+@endsection
+
+@section('js')
+@endsection