Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
No results found
Show changes
Commits on Source (5)
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 3424 additions and 7896 deletions
.DS_Store 0 → 100644
View file @ 220472a3
File added
app/Http/Controllers/PagesController.php
View file @ 220472a3
......@@ -53,7 +53,7 @@ class PagesController extends APIBaseController
}
$last_edited = Pegawai::where('id_user', $id)->first()->updated_at;
return view("profile.index", compact('last_edited', 'nama_pengubah','data_kinerja', 'unit_kerja', 'posisi', 'kelompok_kompetensi', 'rekomendasi_training', 'training_list', 'rekomendasi_posisi'));
return view("profile.index", compact('id', 'last_edited', 'nama_pengubah', 'data_kinerja', 'unit_kerja', 'posisi', 'kelompok_kompetensi', 'rekomendasi_training', 'training_list', 'rekomendasi_posisi'));
}
public function pegawaiSpecific($id){
......@@ -79,8 +79,6 @@ class PagesController extends APIBaseController
}
$last_edited = Pegawai::where('id_user', $id)->first()->updated_at;
return view("profile.pmo", compact('id_pmo','id', 'last_edited', 'nama_pengubah','data_kinerja', 'unit_kerja', 'posisi', 'kelompok_kompetensi', 'rekomendasi_training', 'training_list', 'rekomendasi_posisi'));
}
......
app/Http/Controllers/User/UserAPIController.php
View file @ 220472a3
......@@ -13,6 +13,7 @@ use App\Performance;
use App\Profile;
use App\User;
use Validator;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Hash;
......@@ -25,8 +26,14 @@ class UserAPIController extends APIBaseController
*/
public function index()
{
$posts = User::all();
return $this->sendResponse($posts->toArray(), 'User retrieved successfully.');
$data = DB::table('users')
->join('denormalized_pegawai', 'users.id', '=',
'denormalized_pegawai.id_user')
->select('users.name', 'denormalized_pegawai.nip', 'users.email',
'denormalized_pegawai.pendidikan_terakhir')
->get();
return $this->sendResponse($data->toArray(), 'User retrieved successfully.');
}
......
composer.lock
View file @ 220472a3
This diff is collapsed.
package-lock.json
View file @ 220472a3
This diff is collapsed.
public/css/app.css
View file @ 220472a3
......@@ -12323,7 +12323,7 @@ a.text-dark:focus {
}
.navbar-laravel {
background-color: #fff;
background-color: #003366;
-webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.04);
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.04);
}
......
public/js/app.js
View file @ 220472a3
......@@ -66861,7 +66861,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 
this.disableTambahDataButton = payload.name === "dataPegawai";
this.disableUploadDataButton = payload.name === "dataPegawai" || payload.name === "dataTraining";
this.disableDownloadDataButton = payload.name === "dataTraining";
this.disableDownloadDataButton = payload.name === "dataPegawai" || payload.name === "dataTraining";
},
saveData: function saveData(payload) {
var _this = this;
......@@ -67281,7 +67281,7 @@ var render = function() {
var _c = _vm._self._c || _h
return _c(
"nav",
{ staticClass: "navbar navbar-expand-md bg-primary navbar-dark" },
{ staticClass: "navbar navbar-expand-md navbar-dark navbar-laravel" },
[
_c(
"a",
......@@ -67375,7 +67375,7 @@ var staticRenderFns = [
_c(
"a",
{
staticClass: "btn navbar-btn btn-primary ml-2 text-white",
staticClass: "btn navbar-btn btn-secondary ml-2 text-white",
attrs: { href: "/pages" }
},
[_vm._v("\n Kembali\n ")]
......@@ -67925,7 +67925,7 @@ var render = function() {
? _c(
"button",
{
staticClass: "btn btn-secondary m-1",
staticClass: "btn btn-primary m-1",
attrs: {
type: "button",
"data-toggle": "modal",
......@@ -67950,7 +67950,7 @@ var render = function() {
? _c(
"button",
{
staticClass: "btn btn-primary float-md-right m-1",
staticClass: "btn btn-success float-md-right m-1",
attrs: { type: "button" },
on: { click: _vm.downloadData }
},
......@@ -67966,7 +67966,7 @@ var render = function() {
? _c(
"button",
{
staticClass: "btn btn-secondary float-md-right m-1",
staticClass: "btn btn-primary float-md-right m-1",
attrs: {
type: "button",
"data-toggle": "modal",
......@@ -68570,7 +68570,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
/* 237 */
/***/ (function(module, exports) {
 
module.exports = [{"label":"Nama Lengkap","field":"name"},{"label":"Email","field":"email"}]
module.exports = [{"label":"NIP","field":"nip"},{"label":"Nama Lengkap","field":"name"},{"label":"Email","field":"email"},{"label":"Pendidikan","field":"pendidikan_terakhir"}]
 
/***/ }),
/* 238 */
......@@ -68703,7 +68703,7 @@ var render = function() {
var _c = _vm._self._c || _h
return _c(
"nav",
{ staticClass: "navbar navbar-expand-md bg-primary navbar-dark" },
{ staticClass: "navbar navbar-expand-md navbar-dark navbar-laravel" },
[
_c(
"a",
......@@ -68723,7 +68723,7 @@ var render = function() {
[
_c(
"a",
{ staticClass: "btn navbar-btn btn-primary ml-2 text-white" },
{ staticClass: "btn navbar-btn btn-secondary ml-2 text-black-50" },
[
_c("span", {
staticClass: "oi oi-person",
......@@ -68788,7 +68788,7 @@ var render = function() {
_c(
"button",
{
staticClass: "btn btn-primary m-1",
staticClass: "btn btn-success m-1",
attrs: { type: "button" },
on: { click: _vm.redirectAddUser }
},
public/js/profile.js
View file @ 220472a3
This diff is collapsed.
resources/.DS_Store 0 → 100644
View file @ 220472a3
File added
resources/assets/.DS_Store 0 → 100644
View file @ 220472a3
File added
resources/assets/js/.DS_Store 0 → 100644
View file @ 220472a3
File added
resources/assets/js/components/AdminNavbar.vue
View file @ 220472a3
<template>
<nav class="navbar navbar-expand-md bg-primary navbar-dark">
<nav class="navbar navbar-expand-md navbar-dark navbar-laravel">
<a class="navbar-brand font-weight-bold" href="#">UPT PMO</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse text-center justify-content-end" id="navbar2SupportedContent">
<a class="btn navbar-btn btn-primary ml-2 text-white">
<a class="btn navbar-btn btn-secondary ml-2 text-black-50">
<span class="oi oi-person" title="user icon" aria-hidden="true"></span>
{{ username }}
</a>
......
resources/assets/js/components/AdminPage.vue
View file @ 220472a3
......@@ -6,7 +6,7 @@
<div class="row">
<div class="col-md-3 p-2">
<button type="button"
class="btn btn-primary m-1"
class="btn btn-success m-1"
@click="redirectAddUser">Tambah User</button>
</div>
</div>
......
resources/assets/js/components/PMOMainPage.vue
View file @ 220472a3
......@@ -9,7 +9,7 @@
<div class="row">
<div class="col-md-3 p-2">
<button type="button"
class="btn btn-secondary m-1"
class="btn btn-primary m-1"
data-toggle="modal"
data-target="#addDataModal"
v-if="!disableTambahDataButton">
......@@ -20,13 +20,13 @@
<div class="col-md-3 p-2"></div>
<div class="col-md-3 p-2">
<button type="button"
class="btn btn-primary float-md-right m-1"
class="btn btn-success float-md-right m-1"
v-if="!disableDownloadDataButton"
@click="downloadData">
Download Data
</button>
<button type="button"
class="btn btn-secondary float-md-right m-1"
class="btn btn-primary float-md-right m-1"
data-toggle="modal"
data-target="#uploadModal"
v-if="!disableUploadDataButton">
......@@ -192,7 +192,7 @@
this.disableTambahDataButton = payload.name === "dataPegawai";
this.disableUploadDataButton = payload.name === "dataPegawai" || payload.name === "dataTraining";
this.disableDownloadDataButton = payload.name === "dataTraining";
this.disableDownloadDataButton = payload.name === "dataPegawai" || payload.name === "dataTraining";
},
saveData: function (payload) {
console.log(payload);
......
resources/assets/js/components/PMONavbar.vue
View file @ 220472a3
<template>
<nav class="navbar navbar-expand-md bg-primary navbar-dark">
<nav class="navbar navbar-expand-md navbar-dark navbar-laravel">
<a class="navbar-brand font-weight-bold" href="#">UPT PMO</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
......@@ -18,7 +18,7 @@
</li>
</ul>
<div class="collapse navbar-collapse text-center justify-content-end" id="navbar2SupportedContent">
<a href="/pages" class="btn navbar-btn btn-primary ml-2 text-white">
<a href="/pages" class="btn navbar-btn btn-secondary ml-2 text-white">
Kembali
</a>
</div>
......
resources/assets/js/components/ProfilPegawai.vue
View file @ 220472a3
......@@ -3,8 +3,7 @@
<div class="card" id="profil-pegawai">
<div class="card-header">
Profil Pegawai
<button class="btn btn-primary float-sm-right" v-on:click="editProfilPegawai" v-bind:disabled="disableEdit">
Edit <i class="fas fa-edit"></i>
<button class="btn btn-primary float-sm-right" v-if="isGeneral" v-on:click="editProfilPegawai" v-bind:disabled="disableEdit"> Edit <i class="fas fa-edit"></i>
</button>
</div>
......@@ -52,8 +51,7 @@
<small class="form-text text-muted">*Tanggal lahir. Wajib diisi</small>
</div>
</div>
</div>
</div>
......@@ -186,7 +184,7 @@
<div class="card" id="data-kepegawaian">
<div class="card-header">
Data Kepegawaian
<button class="btn btn-primary float-sm-right" v-on:click="editDataKepegawaian" v-bind:disabled="disableEdit">
<button class="btn btn-primary float-sm-right" v-if="isGeneral" v-on:click="editDataKepegawaian" v-bind:disabled="disableEdit">
Edit <i class="fas fa-edit"></i>
</button>
</div>
......@@ -299,7 +297,7 @@
<div class="card" id="riwayat-pegawai">
<div class="card-header">
Riwayat Pendidikan dan Pekerjaan<button class="btn btn-primary float-sm-right" v-on:click="editRiwayatPegawai" v-bind:disabled="disableEdit">
Riwayat Pendidikan dan Pekerjaan<button class="btn btn-primary float-sm-right" v-if="isGeneral" v-on:click="editRiwayatPegawai" v-bind:disabled="disableEdit">
Edit <i class="fas fa-edit"></i>
</button>
</div>
......@@ -699,7 +697,7 @@
<div class="card-body">
<div class="container">
<button class="btn btn-primary float-sm-left" v-on:click="downloadKompetensi" v-bind:disabled="disableEdit">
<button class="btn btn-success float-sm-left" v-on:click="downloadKompetensi" v-bind:disabled="disableEdit">
Download <i class="fas fa-download"></i>
</button>
......@@ -851,7 +849,7 @@
<script>
export default {
props: ['id', 'unit-kerja', 'posisi', 'kelompok-kompetensi', 'data-kinerja-temp', 'rekomendasi-training-temp', 'training-list', 'rekomendasi-posisi-temp'],
props: ['id_pmo', 'id', 'unit-kerja', 'posisi', 'kelompok-kompetensi', 'data-kinerja-temp', 'rekomendasi-training-temp', 'training-list', 'rekomendasi-posisi-temp'],
data() {
return {
......@@ -874,6 +872,7 @@
riwayatPekerjaan: [],
sertifikat: [],
isGeneral: false,
isShowAllDataKinerja: false,
disableEdit: false,
isEditProfile: false,
......@@ -927,6 +926,9 @@
},
created() {
this.isGeneral = this.id_pmo === "null" ? true : false;
console.log("ID-PMO: " + this.id_pmo + ": " + this.isGeneral);
//dataKinerja
this.dataKinerja = this.dataKinerjaTemp;
......@@ -950,7 +952,7 @@
this.pegawai.tanggalLahir = responsePegawai["pegawai"]["tanggal_lahir"];
this.pegawai.email = responsePegawai["user"]["email"];
this.pegawai.nopeg = responsePegawai["pegawai"]["nip"];
this.pegawai.imageProfileUrl = 'pimage/' + responsePegawai["pegawai"]["nip"] + '.' + responsePegawai["pegawai"]["ekstensi_foto"];
this.pegawai.imageProfileUrl = 'http://localhost:8000/pages/pimage/' + responsePegawai["pegawai"]["nip"] + '.' + responsePegawai["pegawai"]["ekstensi_foto"];
this.pegawai.kompetensi.id = responsePegawai["pegawai"]["id_kelompok_kompetensi"];
this.updateProfilPegawai();
......@@ -1086,7 +1088,7 @@
updateSertifikat(){
for(var i = 0; i < this.sertifikat.length; i++){
this.sertifikat[i].nama_file = 'simage/' + this.sertifikat[i].nama_file;
this.sertifikat[i].nama_file = 'http://localhost:8000/pages/simage/' + this.sertifikat[i].nama_file;
}
},
......
resources/assets/js/components/ProfilPegawaiSpecific.vue → resources/assets/js/components/ProfilPegawaiSpecific copy.vue
View file @ 220472a3
......@@ -4,7 +4,7 @@
<div class="card-header">
Profil Pegawai
<!-- <button class="btn btn-primary float-sm-right" v-on:click="editProfilPegawai" v-bind:disabled="disableEdit">
Edit <i class="fas fa-edit"></i>
Sunting <i class="fas fa-edit"></i>
</button> -->
</div>
......@@ -161,7 +161,7 @@
<div v-if="isEditProfile" id="edit-tahun-masuk" class="form-group">
<input v-model="pegawai.tahunMasuk" type="text" class="form-control">
<small class="form-text text-muted">*Edit pada data kepegawaian di bawah</small>
<small class="form-text text-muted">*Sunting pada data kepegawaian di bawah</small>
</div>
</div>
</div>
......@@ -187,7 +187,7 @@
<div class="card-header">
Data Kepegawaian
<!-- <button class="btn btn-primary float-sm-right" v-on:click="editDataKepegawaian" v-bind:disabled="disableEdit">
Edit <i class="fas fa-edit"></i>
Sunting <i class="fas fa-edit"></i>
</button> -->
</div>
......@@ -301,7 +301,7 @@
<div class="card-header">
Riwayat Pendidikan dan Pekerjaan
<!-- <button class="btn btn-primary float-sm-right" v-on:click="editRiwayatPegawai" v-bind:disabled="disableEdit">
Edit <i class="fas fa-edit"></i>
Sunting <i class="fas fa-edit"></i>
</button> -->
</div>
......@@ -476,7 +476,7 @@
<div class="card" id="sertificate">
<div class="card-header">
Sertifikat<button class="btn btn-primary float-sm-right" v-on:click="editSertifikat" v-bind:disabled="disableEdit">
Edit <i class="fas fa-edit"></i>
Sunting <i class="fas fa-edit"></i>
</button>
</div>
......@@ -596,7 +596,7 @@
<div class="card" id="data-kinerja">
<div class="card-header">
Hasil Kinerja<button class="btn btn-primary float-sm-right" v-on:click="editDataKinerja" v-bind:disabled="disableEdit">
Edit <i class="fas fa-edit"></i>
Sunting <i class="fas fa-edit"></i>
</button>
</div>
......@@ -691,15 +691,15 @@
<div class="card" id="data-kompetensi">
<div class="card-header">
Hasil Kompetensi<button class="btn btn-primary float-sm-right" v-on:click="editKommpetensi" v-bind:disabled="disableEdit">
Edit <i class="fas fa-edit"></i>
Sunting <i class="fas fa-edit"></i>
</button>
</div>
<div class="card-body">
<div class="container">
<button class="btn btn-primary float-sm-left" v-on:click="downloadKompetensi" v-bind:disabled="disableEdit">
Download <i class="fas fa-download"></i>
<button class="btn btn-success float-sm-left" v-on:click="downloadKompetensi" v-bind:disabled="disableEdit">
Unggah <i class="fas fa-download"></i>
</button>
</div>
......@@ -711,7 +711,7 @@
<div class="card" id="rekomendasi">
<div class="card-header">
Rekomendasi<button class="btn btn-primary float-sm-right" v-on:click="editRekomendasi" v-bind:disabled="disableEdit">
Edit <i class="fas fa-edit"></i>
Sunting <i class="fas fa-edit"></i>
</button>
</div>
......
resources/assets/js/components/configs/data-user-columns.json
View file @ 220472a3
[
{
"label": "NIP",
"field": "nip"
},
{
"label": "Nama Lengkap",
"field": "name"
......@@ -6,5 +10,9 @@
{
"label": "Email",
"field": "email"
},
{
"label": "Pendidikan",
"field": "pendidikan_terakhir"
}
]
\ No newline at end of file
resources/assets/js/profile.js
View file @ 220472a3
......@@ -9,8 +9,6 @@ Vue.use(Axios);
new Vue({
el: '#profile-page',
components: {
'profil-pegawai': require('./components/ProfilPegawai.vue'),
'profil-pegawai-specific': require('./components/ProfilPegawaiSpecific.vue'),
'profil-pegawai': require('./components/ProfilPegawai.vue')
}
});
\ No newline at end of file
resources/assets/sass/app.scss
View file @ 220472a3
......@@ -12,7 +12,7 @@
@import '~pretty-checkbox/src/pretty-checkbox.scss';
.navbar-laravel {
background-color: #fff;
background-color: #003366;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.04);
}
......