Skip to content

U
ubux-kendaraan
Commit 2df05813 by Jonatan Sihombing
Options

Menambahkan feature baru pada transaksi mahasiswa

parents 7e184f73 5e2de8d9
Showing with 1075 additions and 2 deletions
backend/modules/ubux/controllers/UbuxKendaraanController.php~5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136 0 → 100644
<?php
namespace backend\modules\ubux\controllers;
use Yii;
use backend\modules\ubux\models\UbuxKendaraan;
use backend\modules\ubux\models\UbuxKendaraanSearch;
use yii\web\Controller;
use yii\web\NotFoundHttpException;
use yii\filters\VerbFilter;
/**
* UbuxKendaraanController implements the CRUD actions for UbuxKendaraan model.
*/
class UbuxKendaraanController extends Controller
{
public function behaviors()
{
return [
//TODO: crud controller actions are bypassed by default, set the appropriate privilege
// 'privilege' => [
// 'class' => \Yii::$app->privilegeControl->getAppPrivilegeControlClass(),
// 'skipActions' => ['*'],
// ],
'verbs' => [
'class' => VerbFilter::className(),
'actions' => [
'delete' => ['post'],
],
],
];
}
/**
* Lists all UbuxKendaraan models.
* @return mixed
*/
public function actionIndex()
{
$searchModel = new UbuxKendaraanSearch();
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
return $this->render('index', [
'searchModel' => $searchModel,
'dataProvider' => $dataProvider,
]);
}
/**
* Displays a single UbuxKendaraan model.
* @param integer $id
* @return mixed
*/
public function actionView($id)
{
return $this->render('view', [
'model' => $this->findModel($id),
]);
}
/**
* Creates a new UbuxKendaraan model.
* If creation is successful, the browser will be redirected to the 'view' page.
* @return mixed
*/
public function actionCreate()
{
$model = new UbuxKendaraan();
if ($model->load(Yii::$app->request->post()) && $model->save()) {
return $this->redirect(['view', 'id' => $model->kendaraan_id]);
} else {
return $this->render('create', [
'model' => $model,
]);
}
}
/**
* Updates an existing UbuxKendaraan model.
* If update is successful, the browser will be redirected to the 'view' page.
* @param integer $id
* @return mixed
*/
public function actionUpdate($id)
{
$model = $this->findModel($id);
if ($model->load(Yii::$app->request->post()) && $model->save()) {
return $this->redirect(['view', 'id' => $model->kendaraan_id]);
} else {
return $this->render('update', [
'model' => $model,
]);
}
}
/**
* Deletes an existing UbuxKendaraan model.
* If deletion is successful, the browser will be redirected to the 'index' page.
* @param integer $id
* @return mixed
*/
public function actionDelete($id)
{
$this->findModel($id)->softDelete();
return $this->redirect(['index']);
}
/**
* Finds the UbuxKendaraan model based on its primary key value.
* If the model is not found, a 404 HTTP exception will be thrown.
* @param integer $id
* @return UbuxKendaraan the loaded model
* @throws NotFoundHttpException if the model cannot be found
*/
protected function findModel($id)
{
if (($model = UbuxKendaraan::findOne($id)) !== null) {
return $model;
} else {
throw new NotFoundHttpException('The requested page does not exist.');
}
}
}
backend/modules/ubux/controllers/UbuxLaporanPemakaianKendaraanController.php
......@@ -15,14 +15,22 @@ use mPDF;
*/
class UbuxLaporanPemakaianKendaraanController extends Controller
{
<<<<<<< HEAD
public function behaviors()
{
return [
//TODO: crud controller actions are bypassed by default, set the appropriate privilege
=======
// public function behaviors()
// {
// return [
// //TODO: crud controller actions are bypassed by default, set the appropriate privilege
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
// 'privilege' => [
// 'class' => \Yii::$app->privilegeControl->getAppPrivilegeControlClass(),
// 'skipActions' => ['*'],
// ],
<<<<<<< HEAD
'verbs' => [
'class' => VerbFilter::className(),
......@@ -32,6 +40,17 @@ class UbuxLaporanPemakaianKendaraanController extends Controller
],
];
}
=======
//
// 'verbs' => [
// 'class' => VerbFilter::className(),
// 'actions' => [
// 'delete' => ['post'],
// ],
// ],
// ];
// }
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
/**
* Lists all UbuxLaporanPemakaianKendaraan models.
......
backend/modules/ubux/controllers/UbuxPegawaiController.php~5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136 0 → 100644
<?php
namespace backend\modules\ubux\controllers;
use Yii;
use backend\modules\ubux\models\UbuxPegawai;
use backend\modules\ubux\models\UbuxPegawaiSearch;
use yii\web\Controller;
use yii\web\NotFoundHttpException;
use yii\filters\VerbFilter;
/**
* UbuxPegawaiController implements the CRUD actions for UbuxPegawai model.
*/
class UbuxPegawaiController extends Controller
{
public function behaviors()
{
return [
//TODO: crud controller actions are bypassed by default, set the appropriate privilege
// 'privilege' => [
// 'class' => \Yii::$app->privilegeControl->getAppPrivilegeControlClass(),
// 'skipActions' => ['*'],
// ],
'verbs' => [
'class' => VerbFilter::className(),
'actions' => [
'delete' => ['post'],
],
],
];
}
/**
* Lists all UbuxPegawai models.
* @return mixed
*/
public function actionIndex()
{
$searchModel = new UbuxPegawaiSearch();
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
return $this->render('index', [
'searchModel' => $searchModel,
'dataProvider' => $dataProvider,
]);
}
/**
* Displays a single UbuxPegawai model.
* @param integer $id
* @return mixed
*/
public function actionView($id)
{
return $this->render('view', [
'model' => $this->findModel($id),
]);
}
/**
* Creates a new UbuxPegawai model.
* If creation is successful, the browser will be redirected to the 'view' page.
* @return mixed
*/
public function actionCreate()
{
$model = new UbuxPegawai();
if ($model->load(Yii::$app->request->post()) && $model->save()) {
return $this->redirect(['view', 'id' => $model->pegawai_id]);
} else {
return $this->render('create', [
'model' => $model,
]);
}
}
/**
* Updates an existing UbuxPegawai model.
* If update is successful, the browser will be redirected to the 'view' page.
* @param integer $id
* @return mixed
*/
public function actionUpdate($id)
{
$model = $this->findModel($id);
if ($model->load(Yii::$app->request->post()) && $model->save()) {
return $this->redirect(['view', 'id' => $model->pegawai_id]);
} else {
return $this->render('update', [
'model' => $model,
]);
}
}
/**
* Deletes an existing UbuxPegawai model.
* If deletion is successful, the browser will be redirected to the 'index' page.
* @param integer $id
* @return mixed
*/
public function actionDelete($id)
{
$this->findModel($id)->softDelete();
return $this->redirect(['index']);
}
/**
* Finds the UbuxPegawai model based on its primary key value.
* If the model is not found, a 404 HTTP exception will be thrown.
* @param integer $id
* @return UbuxPegawai the loaded model
* @throws NotFoundHttpException if the model cannot be found
*/
protected function findModel($id)
{
if (($model = UbuxPegawai::findOne($id)) !== null) {
return $model;
} else {
throw new NotFoundHttpException('The requested page does not exist.');
}
}
}
backend/modules/ubux/controllers/UbuxSupirController.php
......@@ -14,6 +14,7 @@ use yii\filters\VerbFilter;
*/
class UbuxSupirController extends Controller
{
<<<<<<< HEAD
public function behaviors()
{
return [
......@@ -31,6 +32,25 @@ class UbuxSupirController extends Controller
],
];
}
=======
public function behaviors()
{
return [
//TODO: crud controller actions are bypassed by default, set the appropriate privilege
// 'privilege' => [
// 'class' => \Yii::$app->privilegeControl->getAppPrivilegeControlClass(),
// 'skipActions' => ['*'],
// ],
'verbs' => [
'class' => VerbFilter::className(),
'actions' => [
'delete' => ['post'],
],
],
];
}
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
/**
* Lists all UbuxSupir models.
......@@ -105,7 +125,10 @@ class UbuxSupirController extends Controller
public function actionDelete($id)
{
$this->findModel($id)->softDelete();
<<<<<<< HEAD
=======
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
return $this->redirect(['index']);
}
......
backend/modules/ubux/models/UbuxKendaraan.php
......@@ -122,9 +122,12 @@ class UbuxKendaraan extends \yii\db\ActiveRecord
{
return $this->hasMany(UbuxTransaksiKendaraanPegawai::className(), ['kendaraan_id' => 'kendaraan_id']);
}
<<<<<<< HEAD
public function getUbuxTransaksiKendaraanMahasiswaBarus()
{
return $this->hasMany(UbuxTransaksiKendaraanMahasiswaBaru::className(), ['kendaraan_id' => 'kendaraan_id']);
}
=======
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
}
backend/modules/ubux/models/UbuxPegawaiSearch.php
......@@ -41,7 +41,11 @@ class UbuxPegawaiSearch extends UbuxPegawai
*/
public function search($params)
{
<<<<<<< HEAD
$query = UbuxPegawai::find();
=======
$query = UbuxPegawai::find()->where(['deleted' => 0]);
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
$dataProvider = new ActiveDataProvider([
'query' => $query,
......
backend/modules/ubux/models/UbuxSupir.php
......@@ -61,7 +61,11 @@ class UbuxSupir extends \yii\db\ActiveRecord
{
return [
[['name_supir', 'no_telepon_supir'], 'required'],
<<<<<<< HEAD
[['hrdx_pegawai_id', 'deleted'], 'integer'],
=======
[['deleted'], 'integer'],
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
[['deleted_at', 'created_at', 'updated_at'], 'safe'],
[['name_supir'], 'string', 'max' => 45],
[['no_telepon_supir', 'deleted_by', 'created_by', 'updated_by'], 'string', 'max' => 32]
......@@ -75,8 +79,12 @@ class UbuxSupir extends \yii\db\ActiveRecord
{
return [
'supir_id' => 'Supir ID',
<<<<<<< HEAD
'hrdx_pegawai_id' => 'Hrdx Pegawai ID',
'name_supir' => 'Nama Supir',
=======
'name_supir' => 'Name Supir',
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
'no_telepon_supir' => 'No Telepon Supir',
'deleted' => 'Deleted',
'deleted_at' => 'Deleted At',
......@@ -103,10 +111,13 @@ class UbuxSupir extends \yii\db\ActiveRecord
{
return $this->hasMany(UbuxTransaksiKendaraan::className(), ['supir_id' => 'supir_id']);
}
<<<<<<< HEAD
public function getUbuxTransaksiKendaraanBarus()
{
return $this->hasMany(UbuxTransaksiKendaraanMahasiswaBaru::className(), ['supir_id' => 'supir_id']);
}
=======
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
}
backend/modules/ubux/models/UbuxTransaksiKendaraanMahasiswa.php
......@@ -12,7 +12,10 @@ use common\behaviors\DeleteBehavior;
* This is the model class for table "ubux_transaksi_kendaraan".
*
* @property integer $transaksi_kendaraan_id
<<<<<<< HEAD
* @property integer $transaksi_kendaraan_mahasiswa_id
=======
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
* @property string $nama_perequest_kendaraan
* @property string $deskripsi_penggunaan_kendaraan
* @property string $tujuan
......@@ -78,7 +81,11 @@ class UbuxTransaksiKendaraanMahasiswa extends \yii\db\ActiveRecord
{
return [
[['nama_perequest_kendaraan', 'deskripsi_penggunaan_kendaraan', 'tujuan', 'rencana_waktu_keberangkatan', 'rencana_waktu_kembali', 'no_telepon'], 'required'],
<<<<<<< HEAD
[['jumlah_penumpang_kendaraan', 'deleted', 'kendaraan_id', 'supir_id', 'transaksi_kendaraan_mahasiswa_id'], 'integer'],
=======
[['jumlah_penumpang_kendaraan', 'deleted', 'kendaraan_id', 'supir_id'], 'integer'],
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
[['rencana_waktu_keberangkatan', 'rencana_waktu_kembali', 'deleted_at', 'created_at', 'updated_at'], 'safe'],
[['status_request_sekertaris_rektorat', 'status_request_kemahasiswaan', 'role', 'status_request_kabiro_KSD', 'status_request_hrd', 'status_request_keuangan', 'status_request_wr2'], 'string'],
[['file'], 'file'],
......@@ -106,7 +113,11 @@ class UbuxTransaksiKendaraanMahasiswa extends \yii\db\ActiveRecord
'rencana_waktu_keberangkatan' => 'Waktu Keberangkatan',
'rencana_waktu_kembali' => 'Waktu Tiba',
'status_request_sekertaris_rektorat' => 'Status',
<<<<<<< HEAD
'status_request_kemahasiswaan' => 'Status Pemintaan Kemahasiswaan',
=======
'status_request_kemahasiswaan' => 'Status Request Kemahasiswaan',
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
'no_telepon' => 'No Telepon',
'role' => 'Jenis Permintaan',
'proposal' => 'Proposal',
......@@ -121,11 +132,18 @@ class UbuxTransaksiKendaraanMahasiswa extends \yii\db\ActiveRecord
'supir_id' => 'Supir',
'No_Hp_Supir' => 'No Hp Supir',
'file' => 'Proposal',
<<<<<<< HEAD
'status_request_kabiro_KSD' => 'Status Permintaan Kabiro Ksd',
'status_request_hrd' => 'Status Permintaan Hrd',
'status_request_keuangan' => 'Status Permintaan Keuangan',
'status_request_wr2' => 'Status Permintaan Wr2',
'transaksi_kendaraan_mahasiswa_id' => 'Transaksi Kendaraan Mahasiswa ID'
=======
'status_request_kabiro_KSD' => 'Status Request Kabiro Ksd',
'status_request_hrd' => 'Status Request Hrd',
'status_request_keuangan' => 'Status Request Keuangan',
'status_request_wr2' => 'Status Request Wr2',
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
];
}
......
backend/modules/ubux/models/UbuxTransaksiKendaraanMahasiswaSearch.php
......@@ -41,7 +41,11 @@ class UbuxTransaksiKendaraanMahasiswaSearch extends UbuxTransaksiKendaraanMahasi
*/
public function search($params)
{
<<<<<<< HEAD
$query = UbuxTransaksiKendaraanMahasiswa::find();
=======
$query = UbuxTransaksiKendaraanMahasiswa::find()->where(['deleted' => 0]);
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
$dataProvider = new ActiveDataProvider([
'query' => $query,
......
backend/modules/ubux/views/ubux-kendaraan/_form.php
......@@ -33,7 +33,11 @@ use yii\widgets\ActiveForm;
<?= $form->field($model, 'updated_by')->textInput(['maxlength' => true]) ?>
-->
<div class="form-group">
<<<<<<< HEAD
<?= Html::submitButton($model->isNewRecord ? 'Buat' : 'Ubah', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
=======
<?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
</div>
<?php ActiveForm::end(); ?>
......
backend/modules/ubux/views/ubux-kendaraan/create.php
......@@ -6,8 +6,13 @@ use yii\helpers\Html;
/* @var $this yii\web\View */
/* @var $model backend\modules\ubux\models\UbuxKendaraan */
<<<<<<< HEAD
$this->title = 'Tambah Kendaraan';
$this->params['breadcrumbs'][] = ['label' => 'Tambah Kendaraan', 'url' => ['index']];
=======
$this->title = 'Create Ubux Kendaraan';
$this->params['breadcrumbs'][] = ['label' => 'Ubux Kendaraan', 'url' => ['index']];
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="ubux-kendaraan-create">
......
backend/modules/ubux/views/ubux-kendaraan/index.php
......@@ -44,6 +44,7 @@ $this->params['breadcrumbs'][] = $this->title;
'header' => 'Aksi',
'buttons' => [
'view' => function ($url, $model){
<<<<<<< HEAD
return ToolsColumn::renderCustomButton($url, $model, 'Lihat Rincian', 'fa fa-eye');
},
'update' => function ($url, $model){
......@@ -57,12 +58,28 @@ $this->params['breadcrumbs'][] = $this->title;
'data-pjax' => '0',
])."</li>";
=======
return ToolsColumn::renderCustomButton($url, $model, 'Lihat Detail', 'fa fa-eye');
},
'update' => function ($url, $model){
return ToolsColumn::renderCustomButton($url, $model, 'Edit', 'fa fa-pencil');
},
'delete' => function ($url, $model){
return "<li>".Html::a('<span class="fa fa-trash"></span> Hapus', $url, [
'title' => Yii::t('yii', 'Legitimate'),
'data-confirm' => Yii::t('yii', 'Are you sure you want to delete this item?'),
'data-method' => 'post',
'data-pjax' => '0',
])."</li>";
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
},
],
'urlCreator' => function ($action, $model, $key, $index){
if ($action === 'view') {
return Url::toRoute(['view', 'id' => $key]);
}else if ($action === 'update') {
<<<<<<< HEAD
return Url::toRoute(['update', 'id' => $key]);
}else if ($action === 'delete') {
return Url::toRoute(['delete', 'id' => $key]);
......@@ -71,6 +88,15 @@ $this->params['breadcrumbs'][] = $this->title;
],
=======
return Url::toRoute(['edit', 'id' => $key]);
}else if ($action === 'delete') {
return Url::toRoute(['delete', 'id' => $key]);
}
}
],
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
],
]); ?>
......
backend/modules/ubux/views/ubux-kendaraan/update.php
......@@ -5,10 +5,17 @@ use yii\helpers\Html;
/* @var $this yii\web\View */
/* @var $model backend\modules\ubux\models\UbuxKendaraan */
<<<<<<< HEAD
$this->title = 'Ubah Kendaraan : ' . ' ' . $model->kendaraan;
$this->params['breadcrumbs'][] = ['label' => 'Ubah Kendaraan', 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => $model->kendaraan_id, 'url' => ['view', 'id' => $model->kendaraan_id]];
$this->params['breadcrumbs'][] = 'Ubah';
=======
$this->title = 'Update Ubux Kendaraan: ' . ' ' . $model->kendaraan_id;
$this->params['breadcrumbs'][] = ['label' => 'Ubux Kendaraans', 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => $model->kendaraan_id, 'url' => ['view', 'id' => $model->kendaraan_id]];
$this->params['breadcrumbs'][] = 'Update';
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
?>
<div class="ubux-kendaraan-update">
......
backend/modules/ubux/views/ubux-kendaraan/view.php
......@@ -15,11 +15,19 @@ $this->params['breadcrumbs'][] = $this->title;
<h1><?= Html::encode($this->title) ?></h1>
<p>
<<<<<<< HEAD
<?= Html::a('Ubah', ['update', 'id' => $model->kendaraan_id], ['class' => 'btn btn-primary']) ?>
<?= Html::a('Hapus', ['delete', 'id' => $model->kendaraan_id], [
'class' => 'btn btn-danger',
'data' => [
'confirm' => 'Apakah anda yakin ?',
=======
<?= Html::a('Update', ['update', 'id' => $model->kendaraan_id], ['class' => 'btn btn-primary']) ?>
<?= Html::a('Delete', ['delete', 'id' => $model->kendaraan_id], [
'class' => 'btn btn-danger',
'data' => [
'confirm' => 'Are you sure you want to delete this item?',
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
'method' => 'post',
],
]) ?>
......
backend/modules/ubux/views/ubux-laporan-pemakaian-kendaraan/_form.php
......@@ -75,7 +75,11 @@ use backend\modules\ubux\models\UbuxSupir;
) ?>
<div class="form-group">
<<<<<<< HEAD
<?= Html::submitButton($model->isNewRecord ? 'Buat' : 'Ubah', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
=======
<?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
</div>
<?php ActiveForm::end(); ?>
......
backend/modules/ubux/views/ubux-laporan-pemakaian-kendaraan/index.php
......@@ -5,6 +5,10 @@ use yii\grid\GridView;
use yii\helpers\Url;
use common\components\ToolsColumn;
<<<<<<< HEAD
=======
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
/* @var $this yii\web\View */
/* @var $searchModel backend\modules\ubux\models\UbuxLaporanPemakaianKendaraanSearch */
/* @var $dataProvider yii\data\ActiveDataProvider */
......@@ -15,8 +19,15 @@ $this->params['breadcrumbs'][] = $this->title;
<div class="ubux-laporan-pemakaian-kendaraan-index">
<h1><?= Html::encode($this->title) ?></h1>
<<<<<<< HEAD
<p>
=======
<?php // echo $this->render('_search', ['model' => $searchModel]); ?>
<p>
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
<?= Html::a('Tambah Laporan Pemakaian Kendaraan', ['create'], ['class' => 'btn btn-success']) ?>
</p>
......@@ -56,6 +67,7 @@ $this->params['breadcrumbs'][] = $this->title;
'header' => 'Aksi',
'buttons' => [
'view' => function ($url, $model){
<<<<<<< HEAD
return ToolsColumn::renderCustomButton($url, $model, 'Lihat Rincian', 'fa fa-eye');
},
'update' => function ($url, $model){
......@@ -69,17 +81,40 @@ $this->params['breadcrumbs'][] = $this->title;
'data-pjax' => '0',
])."</li>";
=======
return ToolsColumn::renderCustomButton($url, $model, 'Lihat Detail', 'fa fa-eye');
},
'update' => function ($url, $model){
return ToolsColumn::renderCustomButton($url, $model, 'Edit', 'fa fa-pencil');
},
'delete' => function ($url, $model){
return "<li>".Html::a('<span class="fa fa-trash"></span> Hapus', $url, [
'title' => Yii::t('yii', 'Legitimate'),
'data-confirm' => Yii::t('yii', 'Are you sure you want to delete this item?'),
'data-method' => 'post',
'data-pjax' => '0',
])."</li>";
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
},
],
'urlCreator' => function ($action, $model, $key, $index){
if ($action === 'view') {
return Url::toRoute(['view', 'id' => $key]);
}else if ($action === 'update') {
<<<<<<< HEAD
return Url::toRoute(['update', 'id' => $key]);
}else if ($action === 'delete') {
return Url::toRoute(['delete', 'id' => $key]);
}
}
=======
return Url::toRoute(['edit', 'id' => $key]);
}else if ($action === 'delete') {
return Url::toRoute(['delete', 'id' => $key]);
}
}
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
],
],
......
backend/modules/ubux/views/ubux-laporan-pemakaian-kendaraan/update.php
......@@ -5,10 +5,17 @@ use yii\helpers\Html;
/* @var $this yii\web\View */
/* @var $model backend\modules\ubux\models\UbuxLaporanPemakaianKendaraan */
<<<<<<< HEAD
$this->title = 'Ubah Laporan Pemakaian Kendaraan: ' . ' ' . $model->laporan_pemakaian_kendaraan_id;
$this->params['breadcrumbs'][] = ['label' => 'Laporan Pemakaian Kendaraans', 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => $model->laporan_pemakaian_kendaraan_id, 'url' => ['view', 'id' => $model->laporan_pemakaian_kendaraan_id]];
$this->params['breadcrumbs'][] = 'Ubah';
=======
$this->title = 'Update Ubux Laporan Pemakaian Kendaraan: ' . ' ' . $model->laporan_pemakaian_kendaraan_id;
$this->params['breadcrumbs'][] = ['label' => 'Ubux Laporan Pemakaian Kendaraans', 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => $model->laporan_pemakaian_kendaraan_id, 'url' => ['view', 'id' => $model->laporan_pemakaian_kendaraan_id]];
$this->params['breadcrumbs'][] = 'Update';
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
?>
<div class="ubux-laporan-pemakaian-kendaraan-update">
......
backend/modules/ubux/views/ubux-laporan-pemakaian-kendaraan/view.php
......@@ -6,8 +6,13 @@ use yii\widgets\DetailView;
/* @var $this yii\web\View */
/* @var $model backend\modules\ubux\models\UbuxLaporanPemakaianKendaraan */
<<<<<<< HEAD
$this->title = 'Laporan Pemakaian Kendaraan';
$this->params['breadcrumbs'][] = ['label' => 'Ubux Laporan Pemakaian Kendaraan', 'url' => ['index']];
=======
$this->title = $model->laporan_pemakaian_kendaraan_id;
$this->params['breadcrumbs'][] = ['label' => 'Ubux Laporan Pemakaian Kendaraans', 'url' => ['index']];
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="ubux-laporan-pemakaian-kendaraan-view">
......@@ -15,6 +20,7 @@ $this->params['breadcrumbs'][] = $this->title;
<h1><?= Html::encode($this->title) ?></h1>
<p>
<<<<<<< HEAD
<?= Html::a('Ubah', ['update', 'id' => $model->laporan_pemakaian_kendaraan_id], ['class' => 'btn btn-primary']) ?>
<?= Html::a('Hapus', ['delete', 'id' => $model->laporan_pemakaian_kendaraan_id], [
'class' => 'btn btn-danger',
......@@ -24,6 +30,17 @@ $this->params['breadcrumbs'][] = $this->title;
],
]) ?>
<?= Html::a('Cetak', ['sample-pdf', 'id' => $model->laporan_pemakaian_kendaraan_id], ['class' => 'btn btn-warning']) ?>
=======
<?= Html::a('Update', ['update', 'id' => $model->laporan_pemakaian_kendaraan_id], ['class' => 'btn btn-primary']) ?>
<?= Html::a('Delete', ['delete', 'id' => $model->laporan_pemakaian_kendaraan_id], [
'class' => 'btn btn-danger',
'data' => [
'confirm' => 'Are you sure you want to delete this item?',
'method' => 'post',
],
]) ?>
<?= Html::a('Print', ['sample-pdf', 'id' => $model->laporan_pemakaian_kendaraan_id], ['class' => 'btn btn-warning']) ?>
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
</p>
<?= DetailView::widget([
......
backend/modules/ubux/views/ubux-laporan-pemakaian-kendaraan/viewPdf.php
......@@ -6,6 +6,7 @@ use yii\widgets\DetailView;
/* @var $this yii\web\View */
/* @var $model backend\modules\ubux\models\UbuxLaporanPemakaianKendaraan */
<<<<<<< HEAD
$this->title = 'Laporan Pemakaian Kendaraan';
$this->params['breadcrumbs'][] = ['label' => 'Laporan Pemakaian Kendaraans', 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
......@@ -63,21 +64,68 @@ $this->params['breadcrumbs'][] = $this->title;
</tr>
<tr>
<td class="kolom">Waktu Keberangkatan</td>
=======
$this->title = 'Laporan Pemakaian Kendaraan '.$model->laporan_pemakaian_kendaraan_id;
$this->params['breadcrumbs'][] = ['label' => 'Ubux Laporan Pemakaian Kendaraans', 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="ubux-laporan-pemakaian-kendaraan-view">
<div>
<img src="gambar/itdel.jpg" style="width: 100px; width: 100px; float: left">
<h1 style="text-align: center; padding-top: 25px"><?= Html::encode($this->title) ?></h1>
</div>
<table>
<tr>
<td>Tujuan</td>
<td>:</td>
<td><?= $model->tujuan ?></td>
</tr>
<tr>
<td>Deskripsi Penumpang</td>
<td>:</td>
<td><?= $model->deskripsi_penumpang ?></td>
</tr>
<tr>
<td>Jumlah Penumpang</td>
<td>:</td>
<td><?= $model->jumlah_penumpang ?></td>
</tr>
<tr>
<td>Keperluan</td>
<td>:</td>
<td><?= $model->keperluan ?></td>
</tr>
<tr>
<td>Waktu Keberangkatan</td>
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
<td>:</td>
<td><?= $model->waktu_keberangkatan ?></td>
</tr>
<tr>
<<<<<<< HEAD
<td class="kolom">Waktu Tiba</td>
=======
<td>Waktu Tiba</td>
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
<td>:</td>
<td><?= $model->waktu_tiba ?></td>
</tr>
<tr>
<<<<<<< HEAD
<td class="kolom">Kendaraan</td>
<td>:</td>
<td><?= $model->kendaraan->kendaraan ?></td>
</tr>
<tr>
<td class="kolom">Supir</td>
=======
<td>Kendaraan</td>
<td>:</td>
<td><?= $model->kendaraan->kendaraan ?></td>
</tr><tr>
<td>Supir</td>
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
<td>:</td>
<td><?= $model->supir->name_supir ?></td>
</tr>
......@@ -114,6 +162,7 @@ $this->params['breadcrumbs'][] = $this->title;
// ],
// ]) ?>
-->
<<<<<<< HEAD
<br><br><br><br><br><br><br>
<table style="margin-left: 13cm; width: 7cm">
......@@ -154,4 +203,6 @@ $this->params['breadcrumbs'][] = $this->title;
</tr>
</table>
=======
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
</div>
backend/modules/ubux/views/ubux-supir/index.php
......@@ -5,7 +5,10 @@ use yii\grid\GridView;
use yii\helpers\Url;
use common\components\ToolsColumn;
<<<<<<< HEAD
=======
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
/* @var $this yii\web\View */
/* @var $searchModel backend\modules\ubux\models\UbuxSupirSearch */
/* @var $dataProvider yii\data\ActiveDataProvider */
......@@ -44,6 +47,7 @@ $this->params['breadcrumbs'][] = $this->title;
'header' => 'Aksi',
'buttons' => [
'view' => function ($url, $model){
<<<<<<< HEAD
return ToolsColumn::renderCustomButton($url, $model, 'Lihat Rincian', 'fa fa-eye');
},
'update' => function ($url, $model){
......@@ -57,17 +61,40 @@ $this->params['breadcrumbs'][] = $this->title;
'data-pjax' => '0',
])."</li>";
=======
return ToolsColumn::renderCustomButton($url, $model, 'Lihat Detail', 'fa fa-eye');
},
'update' => function ($url, $model){
return ToolsColumn::renderCustomButton($url, $model, 'Edit', 'fa fa-pencil');
},
'delete' => function ($url, $model){
return "<li>".Html::a('<span class="fa fa-trash"></span> Hapus', $url, [
'title' => Yii::t('yii', 'Legitimate'),
'data-confirm' => Yii::t('yii', 'Are you sure you want to delete this item?'),
'data-method' => 'post',
'data-pjax' => '0',
])."</li>";
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
},
],
'urlCreator' => function ($action, $model, $key, $index){
if ($action === 'view') {
return Url::toRoute(['view', 'id' => $key]);
}else if ($action === 'update') {
<<<<<<< HEAD
return Url::toRoute(['update', 'id' => $key]);
}else if ($action === 'delete') {
return Url::toRoute(['delete', 'id' => $key]);
}
}
=======
return Url::toRoute(['edit', 'id' => $key]);
}else if ($action === 'delete') {
return Url::toRoute(['delete', 'id' => $key]);
}
}
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
],
],
......
backend/modules/ubux/views/ubux-supir/update.php
......@@ -5,10 +5,17 @@ use yii\helpers\Html;
/* @var $this yii\web\View */
/* @var $model backend\modules\ubux\models\UbuxSupir */
<<<<<<< HEAD
$this->title = 'Ubah Supir : ' . ' ' . $model->name_supir;
$this->params['breadcrumbs'][] = ['label' => 'Ubah Supir', 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => $model->supir_id, 'url' => ['view', 'id' => $model->supir_id]];
$this->params['breadcrumbs'][] = 'Ubah';
=======
$this->title = 'Update Ubux Supir: ' . ' ' . $model->supir_id;
$this->params['breadcrumbs'][] = ['label' => 'Ubux Supirs', 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => $model->supir_id, 'url' => ['view', 'id' => $model->supir_id]];
$this->params['breadcrumbs'][] = 'Update';
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
?>
<div class="ubux-supir-update">
......
backend/modules/ubux/views/ubux-supir/view.php
......@@ -15,11 +15,19 @@ $this->params['breadcrumbs'][] = $this->title;
<h1><?= Html::encode($this->title) ?></h1>
<p>
<<<<<<< HEAD
<?= Html::a('Ubah', ['update', 'id' => $model->supir_id], ['class' => 'btn btn-primary']) ?>
<?= Html::a('Hapus', ['delete', 'id' => $model->supir_id], [
'class' => 'btn btn-danger',
'data' => [
'confirm' => 'Apakah anda yakin ?',
=======
<?= Html::a('Update', ['Ubah', 'id' => $model->supir_id], ['class' => 'btn btn-primary']) ?>
<?= Html::a('Delete', ['Hapus', 'id' => $model->supir_id], [
'class' => 'btn btn-danger',
'data' => [
'confirm' => 'Are you sure you want to delete this item?',
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
'method' => 'post',
],
]) ?>
......
backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/PopUp.php
......@@ -13,7 +13,11 @@ $this->title = 'Kesalahan';
'options' => [
'class' => 'alert-danger',
],
<<<<<<< HEAD
'body' => 'Tidak Bisa Mengubah atau Menghapus karena Sudah Disetujui atau Ditolak',
=======
'body' => 'Tidak Bisa Mengubah atau Menghapus karena Sudah di Accept atau Reject',
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
]);
?>
<?= Html::a('Kembali', ['index'], ['class' => 'btn btn-success']) ?>
......
backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/PopUpPegawai.php
......@@ -13,7 +13,11 @@ $this->title = 'Kesalahan';
'options' => [
'class' => 'alert-danger',
],
<<<<<<< HEAD
'body' => 'Tidak Bisa Mengubah atau Menghapus karena Sudah Disetujui atau Ditolak',
=======
'body' => 'Tidak Bisa Mengubah atau Menghapus karena Sudah di Accept atau Reject',
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
]);
?>
<?= Html::a('Kembali', ['index-by-pegawai'], ['class' => 'btn btn-success']) ?>
......
backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/PopUpPribadi.php
......@@ -13,7 +13,11 @@ $this->title = 'Kesalahan';
'options' => [
'class' => 'alert-danger',
],
<<<<<<< HEAD
'body' => 'Tidak Bisa Mengubah atau Menghapus karena Sudah Disetujui atau Ditolak',
=======
'body' => 'Tidak Bisa Mengubah atau Menghapus karena Sudah di Accept atau Reject',
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
]);
?>
<?= Html::a('Kembali', ['index-by-pribadi'], ['class' => 'btn btn-success']) ?>
......
backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/_form.php
......@@ -46,9 +46,15 @@ use backend\modules\ubux\models\UbuxKendaraan;
]); ?>
<!--
<<<<<<< HEAD
<?= $form->field($model, 'status_request_sekertaris_rektorat')->dropDownList([ 'Menunggu' => 'Menunggu', 'Diterima' => 'Diterima', 'Ditolak' => 'Ditolak', ], ['prompt' => '']) ?>
<?= $form->field($model, 'status_request_kemahasiswaan')->dropDownList([ 'Menunggu' => 'Menunggu', 'Diterima' => 'Diterima', 'Ditolak' => 'Ditolak', ], ['prompt' => '']) ?>
=======
<?= $form->field($model, 'status_request_sekertaris_rektorat')->dropDownList([ 'Pending' => 'Pending', 'Accepted' => 'Accepted', 'Rejected' => 'Rejected', ], ['prompt' => '']) ?>
<?= $form->field($model, 'status_request_kemahasiswaan')->dropDownList([ 'Pending' => 'Pending', 'Accepted' => 'Accepted', 'Rejected' => 'Rejected', ], ['prompt' => '']) ?>
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
<?= $form->field($model, 'role')->dropDownList([ 'Mahasiswa' => 'Mahasiswa', 'Pegawai' => 'Pegawai', ], ['prompt' => '']) ?>
......@@ -80,7 +86,11 @@ use backend\modules\ubux\models\UbuxKendaraan;
) ?>
-->
<div class="form-group">
<<<<<<< HEAD
<?= Html::submitButton($model->isNewRecord ? 'Buat' : 'Ubah', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
=======
<?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
</div>
<?php ActiveForm::end(); ?>
......
backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/_formByPegawai.php
......@@ -48,9 +48,15 @@ use backend\modules\ubux\models\UbuxKendaraan;
]); ?>
<!--
<<<<<<< HEAD
<?= $form->field($model, 'status_request_sekertaris_rektorat')->dropDownList([ 'Menunggu' => 'Menunggu', 'Diterima' => 'Diterima', 'Ditolak' => 'Ditolak', ], ['prompt' => '']) ?>
<?= $form->field($model, 'status_request_kemahasiswaan')->dropDownList([ 'Menunggu' => 'Menunggu', 'Diterima' => 'Diterima', 'Ditolak' => 'Ditolak', ], ['prompt' => '']) ?>
=======
<?= $form->field($model, 'status_request_sekertaris_rektorat')->dropDownList([ 'Pending' => 'Pending', 'Accepted' => 'Accepted', 'Rejected' => 'Rejected', ], ['prompt' => '']) ?>
<?= $form->field($model, 'status_request_kemahasiswaan')->dropDownList([ 'Pending' => 'Pending', 'Accepted' => 'Accepted', 'Rejected' => 'Rejected', ], ['prompt' => '']) ?>
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
<?= $form->field($model, 'role')->dropDownList([ 'Mahasiswa' => 'Mahasiswa', 'Pegawai' => 'Pegawai', ], ['prompt' => '']) ?>
......@@ -82,7 +88,11 @@ use backend\modules\ubux\models\UbuxKendaraan;
) ?>
-->
<div class="form-group">
<<<<<<< HEAD
<?= Html::submitButton($model->isNewRecord ? 'Buat' : 'Ubah', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
=======
<?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
</div>
<?php ActiveForm::end(); ?>
......
backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/_formByPribadi.php
......@@ -48,9 +48,15 @@ use backend\modules\ubux\models\UbuxKendaraan;
]); ?>
<!--
<<<<<<< HEAD
<?= $form->field($model, 'status_request_sekertaris_rektorat')->dropDownList([ 'Menunggu' => 'Menunggu', 'Diterima' => 'Diterima', 'Ditolak' => 'Ditolak', ], ['prompt' => '']) ?>
<?= $form->field($model, 'status_request_kemahasiswaan')->dropDownList([ 'Menunggu' => 'Menunggu', 'Diterima' => 'Diterima', 'Ditolak' => 'Ditolak', ], ['prompt' => '']) ?>
=======
<?= $form->field($model, 'status_request_sekertaris_rektorat')->dropDownList([ 'Pending' => 'Pending', 'Accepted' => 'Accepted', 'Rejected' => 'Rejected', ], ['prompt' => '']) ?>
<?= $form->field($model, 'status_request_kemahasiswaan')->dropDownList([ 'Pending' => 'Pending', 'Accepted' => 'Accepted', 'Rejected' => 'Rejected', ], ['prompt' => '']) ?>
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
<?= $form->field($model, 'role')->dropDownList([ 'Mahasiswa' => 'Mahasiswa', 'Pegawai' => 'Pegawai', ], ['prompt' => '']) ?>
......@@ -82,7 +88,11 @@ use backend\modules\ubux\models\UbuxKendaraan;
) ?>
-->
<div class="form-group">
<<<<<<< HEAD
<?= Html::submitButton($model->isNewRecord ? 'Buat' : 'Ubah', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
=======
<?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
</div>
<?php ActiveForm::end(); ?>
......
backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/_formBySekertarisRektorat.php
......@@ -34,7 +34,11 @@ use backend\modules\ubux\models\UbuxSupir;
<?= $form->field($model, 'No_Hp_Supir')->textInput(['maxlength' => true]) ?>
-->
<div class="form-group">
<<<<<<< HEAD
<?= Html::submitButton($model->isNewRecord ? 'Buat' : 'Tambah', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-success']) ?>
=======
<?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
</div>
<?php ActiveForm::end(); ?>
......
backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/create.php
......@@ -6,8 +6,13 @@ use yii\helpers\Html;
/* @var $this yii\web\View */
/* @var $model backend\modules\ubux\models\UbuxTransaksiKendaraanMahasiswa */
<<<<<<< HEAD:backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/create.php
$this->title = 'Permintaan Kendaraan oleh Mahasiswa';
$this->params['breadcrumbs'][] = ['label' => 'Permintaan Kendaraan Mahasiswa', 'url' => ['index']];
=======
$this->title = 'Request Kendaraan by Mahasiswa';
$this->params['breadcrumbs'][] = ['label' => 'Request Kendaraan Mahasiswa', 'url' => ['index']];
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136:backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/create.php
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="ubux-transaksi-kendaraan-mahasiswa-create">
......
backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/index.php
......@@ -9,7 +9,11 @@ use yii\bootstrap\Alert;
/* @var $searchModel backend\modules\ubux\models\UbuxTransaksiKendaraanMahasiswaSearch */
/* @var $dataProvider yii\data\ActiveDataProvider */
<<<<<<< HEAD
$this->title = 'Data Permintaan Kendaraan Mahasiswa';
=======
$this->title = 'Data Request Kendaraan Mahasiswa';
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="ubux-transaksi-kendaraan-mahasiswa-index">
......@@ -18,7 +22,11 @@ $this->params['breadcrumbs'][] = $this->title;
<?php // echo $this->render('_search', ['model' => $searchModel]); ?>
<p>
<<<<<<< HEAD
<?= Html::a('Buat Permintaan Kendaraan', ['create'], ['class' => 'btn btn-success']) ?>
=======
<?= Html::a('Request Kendaraan', ['create'], ['class' => 'btn btn-success']) ?>
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
</p>
<?= GridView::widget([
......@@ -58,7 +66,11 @@ $this->params['breadcrumbs'][] = $this->title;
if($action === 'view'){
return Url::toRoute(['view', 'id' => $key]);
}
<<<<<<< HEAD
if($model->status_request_sekertaris_rektorat == 'Menunggu'){
=======
if($model->status_request_sekertaris_rektorat == 'Pending'){
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
if($action == 'edit'){
return Url::toRoute(['update', 'id' => $key]);
}
......@@ -73,4 +85,8 @@ $this->params['breadcrumbs'][] = $this->title;
],
]); ?>
<<<<<<< HEAD
=======
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
</div>
backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/indexByHrd.php
......@@ -9,7 +9,11 @@ use yii\bootstrap\Alert;
/* @var $searchModel backend\modules\ubux\models\UbuxTransaksiKendaraanMahasiswaSearch */
/* @var $dataProvider yii\data\ActiveDataProvider */
<<<<<<< HEAD
$this->title = 'Data Permintaan Kendaraan Pribadi';
=======
$this->title = 'Data Request Kendaraan Pribadi';
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="ubux-transaksi-kendaraan-mahasiswa-index">
......
backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/indexByKabiroKsd.php
......@@ -9,7 +9,11 @@ use yii\bootstrap\Alert;
/* @var $searchModel backend\modules\ubux\models\UbuxTransaksiKendaraanMahasiswaSearch */
/* @var $dataProvider yii\data\ActiveDataProvider */
<<<<<<< HEAD
$this->title = 'Data Permintaan Kendaraan Pribadi';
=======
$this->title = 'Data Request Kendaraan Pribadi';
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="ubux-transaksi-kendaraan-mahasiswa-index">
......
backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/indexByKemahasiswaan.php
......@@ -8,7 +8,11 @@ use yii\helpers\Url;
/* @var $searchModel backend\modules\ubux\models\UbuxTransaksiKendaraanMahasiswaSearch */
/* @var $dataProvider yii\data\ActiveDataProvider */
<<<<<<< HEAD
$this->title = 'Semua Permintaan Kendaraan Mahasiswa';
=======
$this->title = 'Semua Request Mahasiswa';
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="ubux-transaksi-kendaraan-mahasiswa-index">
......
backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/indexByKeuangan.php
......@@ -9,7 +9,11 @@ use yii\bootstrap\Alert;
/* @var $searchModel backend\modules\ubux\models\UbuxTransaksiKendaraanMahasiswaSearch */
/* @var $dataProvider yii\data\ActiveDataProvider */
<<<<<<< HEAD
$this->title = 'Data Permintaan Kendaraan Pribadi';
=======
$this->title = 'Data Request Kendaraan Pribadi';
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="ubux-transaksi-kendaraan-mahasiswa-index">
......
backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/indexByPegawai.php
......@@ -8,7 +8,11 @@ use yii\helpers\Url;
/* @var $searchModel backend\modules\ubux\models\UbuxTransaksiKendaraanMahasiswaSearch */
/* @var $dataProvider yii\data\ActiveDataProvider */
<<<<<<< HEAD
$this->title = 'Semua Permintaan Kendaraan Pegawai';
=======
$this->title = 'Semua Request Pegawai';
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="ubux-transaksi-kendaraan-mahasiswa-index">
......@@ -17,7 +21,11 @@ $this->params['breadcrumbs'][] = $this->title;
<?php // echo $this->render('_search', ['model' => $searchModel]); ?>
<p>
<<<<<<< HEAD
<?= Html::a('Permintaan Kendaraan Pegawai', ['create-by-pegawai'], ['class' => 'btn btn-success']) ?>
=======
<?= Html::a('Request Kendaraan Pegawai', ['create-by-pegawai'], ['class' => 'btn btn-success']) ?>
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
</p>
<?= GridView::widget([
......@@ -55,7 +63,11 @@ $this->params['breadcrumbs'][] = $this->title;
if($action === 'view'){
return Url::toRoute(['view-by-pegawai', 'id' => $key]);
}
<<<<<<< HEAD
if($model->status_request_sekertaris_rektorat == 'Menunggu'){
=======
if($model->status_request_sekertaris_rektorat == 'Pending'){
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
if($action == 'edit'){
return Url::toRoute(['update-by-pegawai', 'id' => $key]);
}
......
backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/indexByPribadi.php
......@@ -9,7 +9,11 @@ use yii\bootstrap\Alert;
/* @var $searchModel backend\modules\ubux\models\UbuxTransaksiKendaraanMahasiswaSearch */
/* @var $dataProvider yii\data\ActiveDataProvider */
<<<<<<< HEAD
$this->title = 'Data Permintaan Kendaraan Pribadi';
=======
$this->title = 'Data Request Kendaraan Pribadi';
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="ubux-transaksi-kendaraan-mahasiswa-index">
......@@ -18,7 +22,11 @@ $this->params['breadcrumbs'][] = $this->title;
<?php // echo $this->render('_search', ['model' => $searchModel]); ?>
<p>
<<<<<<< HEAD
<?= Html::a('Permintaan Kendaraan Pribadi', ['create-by-pribadi'], ['class' => 'btn btn-success']) ?>
=======
<?= Html::a('Request Kendaraan Pribadi', ['create-by-pribadi'], ['class' => 'btn btn-success']) ?>
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
</p>
<?= GridView::widget([
......@@ -65,7 +73,11 @@ $this->params['breadcrumbs'][] = $this->title;
if($action === 'view'){
return Url::toRoute(['view-by-pribadi', 'id' => $key]);
}
<<<<<<< HEAD
if($model->status_request_sekertaris_rektorat == 'Menunggu' && $model->status_request_kemahasiswaan == 'Menunggu' && $model->status_request_hrd == 'Menunggu' && $model->status_request_kabiro_KSD == 'Menunggu' && $model->status_request_keuangan == 'Menunggu' && $model->status_request_wr2 == 'Menunggu'){
=======
if($model->status_request_sekertaris_rektorat == 'Pending' && $model->status_request_kemahasiswaan == 'Pending' && $model->status_request_hrd == 'Pending' && $model->status_request_kabiro_KSD == 'Pending' && $model->status_request_keuangan == 'Pending' && $model->status_request_wr2 == 'Pending'){
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
if($action == 'edit'){
return Url::toRoute(['update-by-pribadi', 'id' => $key]);
}
......
backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/indexBySekertarisRektorat.php
......@@ -8,7 +8,11 @@ use yii\helpers\Url;
/* @var $searchModel backend\modules\ubux\models\UbuxTransaksiKendaraanMahasiswaSearch */
/* @var $dataProvider yii\data\ActiveDataProvider */
<<<<<<< HEAD
$this->title = 'Semua Permintaan Kendaraan';
=======
$this->title = 'Semua Request Kendaraan';
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="ubux-transaksi-kendaraan-mahasiswa-index">
......@@ -17,7 +21,11 @@ $this->params['breadcrumbs'][] = $this->title;
<?php // echo $this->render('_search', ['model' => $searchModel]); ?>
<!--
<p>
<<<<<<< HEAD
<?= Html::a('Permintaan Kendaraan', ['create'], ['class' => 'btn btn-success']) ?>
=======
<?= Html::a('Request Kendaraan', ['create'], ['class' => 'btn btn-success']) ?>
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
</p>
-->
<?= GridView::widget([
......
backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/indexByWr2.php
......@@ -9,7 +9,11 @@ use yii\bootstrap\Alert;
/* @var $searchModel backend\modules\ubux\models\UbuxTransaksiKendaraanMahasiswaSearch */
/* @var $dataProvider yii\data\ActiveDataProvider */
<<<<<<< HEAD
$this->title = 'Data Permintaan Kendaraan Pribadi';
=======
$this->title = 'Data Request Kendaraan Pribadi';
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="ubux-transaksi-kendaraan-mahasiswa-index">
......
backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/update.php~5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136 0 → 100644
<?php
use yii\helpers\Html;
/* @var $this yii\web\View */
/* @var $model backend\modules\ubux\models\UbuxTransaksiKendaraanMahasiswa */
$this->title = 'Update Ubux Transaksi Kendaraan Mahasiswa: ' . ' ' . $model->transaksi_kendaraan_id;
$this->params['breadcrumbs'][] = ['label' => 'Ubux Transaksi Kendaraan Mahasiswa', 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => $model->transaksi_kendaraan_id, 'url' => ['view', 'id' => $model->transaksi_kendaraan_id]];
$this->params['breadcrumbs'][] = 'Update';
?>
<div class="ubux-transaksi-kendaraan-mahasiswa-update">
<h1><?= Html::encode($this->title) ?></h1>
<?= $this->render('_form', [
'model' => $model,
]) ?>
</div>
backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/view.php
......@@ -6,8 +6,13 @@ use yii\widgets\DetailView;
/* @var $this yii\web\View */
/* @var $model backend\modules\ubux\models\UbuxTransaksiKendaraanMahasiswa */
<<<<<<< HEAD
$this->title = 'Permintaan Kendaraan Mahasiswa';
$this->params['breadcrumbs'][] = ['label' => 'Permintaan Kendaraan Mahasiswa', 'url' => ['index']];
=======
$this->title = 'Request Mahasiswa '.$model->transaksi_kendaraan_id;
$this->params['breadcrumbs'][] = ['label' => 'Ubux Transaksi Kendaraan Mahasiswa', 'url' => ['index']];
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="ubux-transaksi-kendaraan-mahasiswa-view">
......@@ -16,17 +21,28 @@ $this->params['breadcrumbs'][] = $this->title;
<p>
<?php
<<<<<<< HEAD
if($model->status_request_sekertaris_rektorat == 'Menunggu') {
echo Html::a('Ubah', ['update', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-primary']);
echo Html::a('Hapus', ['delete', 'id' => $model->transaksi_kendaraan_id], [
=======
if($model->status_request_sekertaris_rektorat == 'Pending') {
echo Html::a('Update', ['update', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-primary']);
echo Html::a('Delete', ['delete', 'id' => $model->transaksi_kendaraan_id], [
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
'class' => 'btn btn-danger',
'data' => [
'confirm' => 'Are you sure you want to delete this item?',
'method' => 'post',
],
]);
<<<<<<< HEAD
}else if($model->status_request_sekertaris_rektorat == 'Diterima'){
echo Html::a('Cetak', ['sample-pdf', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-warning']);
=======
}else if($model->status_request_sekertaris_rektorat == 'Accepted'){
echo Html::a('Print', ['sample-pdf', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-warning']);
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
}
?>
</p>
......
backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/viewByHrd.php
......@@ -6,6 +6,7 @@ use yii\widgets\DetailView;
/* @var $this yii\web\View */
/* @var $model backend\modules\ubux\models\UbuxTransaksiKendaraanMahasiswa */
<<<<<<< HEAD
$this->title = 'Permintaan Kendaraan Pribadi';
$this->params['breadcrumbs'][] = ['label' => 'Permintaan Kendaraan Pribadi', 'url' => ['index-by-hrd']];
$this->params['breadcrumbs'][] = $this->title;
......@@ -16,6 +17,18 @@ $this->params['breadcrumbs'][] = $this->title;
<?php
echo Html::a('Setuju', ['accept-by-hrd', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-success']);
echo Html::a('Tolak', ['reject-by-hrd', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-danger']);
=======
$this->title = $model->transaksi_kendaraan_id;
$this->params['breadcrumbs'][] = ['label' => 'Ubux Transaksi Kendaraan Pribadi', 'url' => ['index-by-hrd']];
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="ubux-transaksi-kendaraan-mahasiswa-view">
<h1>Request Pribadi : <?= Html::encode($this->title) ?></h1>
<?php
echo Html::a('Accept', ['accept-by-hrd', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-success']);
echo Html::a('Reject', ['reject-by-hrd', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-danger']);
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
?>
<?= DetailView::widget([
......@@ -50,7 +63,11 @@ $this->params['breadcrumbs'][] = $this->title;
],
'No_Hp_Supir',
[
<<<<<<< HEAD
'attribute' => 'Status Request Sekertaris Rektorat',
=======
'attribute' => 'Status Request Sekertaris Rektorat',
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
'value' => $model->status_request_sekertaris_rektorat,
],
'status_request_kabiro_KSD',
......
backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/viewByKabiroKsd.php
......@@ -6,6 +6,7 @@ use yii\widgets\DetailView;
/* @var $this yii\web\View */
/* @var $model backend\modules\ubux\models\UbuxTransaksiKendaraanMahasiswa */
<<<<<<< HEAD
$this->title = 'Permintaan Kendaraan Pribadi';
$this->params['breadcrumbs'][] = ['label' => 'Permintaan Kendaraan Pribadi', 'url' => ['index-by-kabiro-ksd']];
$this->params['breadcrumbs'][] = $this->title;
......@@ -16,6 +17,18 @@ $this->params['breadcrumbs'][] = $this->title;
<?php
echo Html::a('Setuju', ['accept-by-kabiro-ksd', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-success']);
echo Html::a('Tolak', ['reject-by-kabiro-ksd', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-danger']);
=======
$this->title = $model->transaksi_kendaraan_id;
$this->params['breadcrumbs'][] = ['label' => 'Ubux Transaksi Kendaraan Pribadi', 'url' => ['index-by-kabiro-ksd']];
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="ubux-transaksi-kendaraan-mahasiswa-view">
<h1>Request Pribadi : <?= Html::encode($this->title) ?></h1>
<?php
echo Html::a('Accept', ['accept-by-kabiro-ksd', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-success']);
echo Html::a('Reject', ['reject-by-kabiro-ksd', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-danger']);
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
?>
<?= DetailView::widget([
......
backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/viewByKemahasiswaan.php
......@@ -6,8 +6,13 @@ use yii\widgets\DetailView;
/* @var $this yii\web\View */
/* @var $model backend\modules\ubux\models\UbuxTransaksiKendaraanMahasiswa */
<<<<<<< HEAD
$this->title = 'Permintaan Kendaraan Mahasiswa ';
$this->params['breadcrumbs'][] = ['label' => 'Permintaan Kendaraan Mahasiswa', 'url' => ['index-by-kemahasiswaan']];
=======
$this->title = 'Request Mahasiswa '.$model->transaksi_kendaraan_id;
$this->params['breadcrumbs'][] = ['label' => 'Ubux Transaksi Kendaraan Mahasiswa', 'url' => ['index-by-kemahasiswaan']];
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="ubux-transaksi-kendaraan-mahasiswa-view">
......@@ -15,9 +20,15 @@ $this->params['breadcrumbs'][] = $this->title;
<h1><?= Html::encode($this->title) ?></h1>
<?php
<<<<<<< HEAD
echo Html::a('Setuju', ['accept', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-success']);
echo Html::a('Tolak', ['reject', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-danger']);
echo Html::a('Cetak', ['kemahasiswaan-pdf', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-warning']);
=======
echo Html::a('Accept', ['accept', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-success']);
echo Html::a('Reject', ['reject', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-danger']);
echo Html::a('Print', ['kemahasiswaan-pdf', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-warning']);
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
?>
<?= DetailView::widget([
......@@ -34,11 +45,14 @@ $this->params['breadcrumbs'][] = $this->title;
'status_request_kemahasiswaan',
'role',
'proposal',
<<<<<<< HEAD
// [
// 'attribute' => 'Proposal',
// 'format' => 'raw',
// 'value' => Html::a($model->proposal, ['download', 'id' => $model->proposal]),
// ],
=======
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
// 'deleted',
// 'deleted_at',
// 'deleted_by',
......
backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/viewByKemahasiswaanPdf.php
......@@ -6,6 +6,7 @@ use yii\widgets\DetailView;
/* @var $this yii\web\View */
/* @var $model backend\modules\ubux\models\UbuxTransaksiKendaraanMahasiswa */
<<<<<<< HEAD
$this->title = 'Permintaan Kendaraan Mahasiswa';
$this->params['breadcrumbs'][] = ['label' => 'Permintaan Kendaraan Mahasiswa', 'url' => ['index-by-kemahasiswaan']];
$this->params['breadcrumbs'][] = $this->title;
......@@ -115,6 +116,34 @@ $this->params['breadcrumbs'][] = $this->title;
// 'status_request_kemahasiswaan',
// 'role',
// 'no_telepon',
=======
$this->title = 'Request Kendaraan Mahasiswa';
$this->params['breadcrumbs'][] = ['label' => 'Ubux Transaksi Kendaraan Mahasiswa', 'url' => ['index-by-kemahasiswaan']];
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="ubux-transaksi-kendaraan-mahasiswa-view">
<div>
<img src="gambar/itdel.jpg" style="width: 100px; width: 100px; float: left">
<h1 style="text-align: center; padding-top: 25px"><?= Html::encode($this->title) ?></h1>
</div>
<?= DetailView::widget([
'model' => $model,
'attributes' => [
// 'transaksi_kendaraan_id',
'nama_perequest_kendaraan',
'deskripsi_penggunaan_kendaraan',
'tujuan',
'jumlah_penumpang_kendaraan',
'rencana_waktu_keberangkatan',
'rencana_waktu_kembali',
'status_request_sekertaris_rektorat',
'status_request_kemahasiswaan',
'role',
'no_telepon',
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
// 'proposal',
// 'deleted',
// 'deleted_at',
......@@ -124,6 +153,7 @@ $this->params['breadcrumbs'][] = $this->title;
// 'updated_at',
// 'updated_by',
// 'kendaraan_id',
<<<<<<< HEAD
// [
// 'attribute' => 'Jenis Mobil',
// 'value' => $model->kendaraan->kendaraan,
......@@ -159,4 +189,19 @@ $this->params['breadcrumbs'][] = $this->title;
<tr>
<td>www.del.ac.id</td>
</tr>
</table>
\ No newline at end of file
</table>
=======
[
'attribute' => 'Jenis Mobil',
'value' => $model->kendaraan->kendaraan,
],
[
'attribute' => 'Supir',
'value' => $model->supir->name_supir,
],
'No_Hp_Supir',
],
]) ?>
</div>
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/viewByKeuangan.php
......@@ -6,6 +6,7 @@ use yii\widgets\DetailView;
/* @var $this yii\web\View */
/* @var $model backend\modules\ubux\models\UbuxTransaksiKendaraanMahasiswa */
<<<<<<< HEAD
$this->title = 'Permintaan Kendaraan Pribadi';
$this->params['breadcrumbs'][] = ['label' => 'Permintaan Kendaraan Pribadi', 'url' => ['index-by-keuangan']];
$this->params['breadcrumbs'][] = $this->title;
......@@ -16,6 +17,18 @@ $this->params['breadcrumbs'][] = $this->title;
<?php
echo Html::a('Setuju', ['accept-by-keuangan', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-success']);
echo Html::a('Tolak', ['reject-by-keuangan', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-danger']);
=======
$this->title = $model->transaksi_kendaraan_id;
$this->params['breadcrumbs'][] = ['label' => 'Ubux Transaksi Kendaraan Pribadi', 'url' => ['index-by-keuangan']];
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="ubux-transaksi-kendaraan-mahasiswa-view">
<h1>Request Pribadi : <?= Html::encode($this->title) ?></h1>
<?php
echo Html::a('Accept', ['accept-by-keuangan', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-success']);
echo Html::a('Reject', ['reject-by-keuangan', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-danger']);
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
?>
<?= DetailView::widget([
......
backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/viewByPegawai.php
......@@ -6,8 +6,13 @@ use yii\widgets\DetailView;
/* @var $this yii\web\View */
/* @var $model backend\modules\ubux\models\UbuxTransaksiKendaraanMahasiswa */
<<<<<<< HEAD
$this->title = 'Permintaan Kendaraan Pegawai';
$this->params['breadcrumbs'][] = ['label' => 'Semua Permintaan Kendaraan Pegawai', 'url' => ['index-by-pegawai']];
=======
$this->title = 'Request Kendaraan '.$model->transaksi_kendaraan_id;
$this->params['breadcrumbs'][] = ['label' => 'Semua Request Pegawai', 'url' => ['index-by-pegawai']];
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="ubux-transaksi-kendaraan-mahasiswa-view">
......@@ -15,16 +20,26 @@ $this->params['breadcrumbs'][] = $this->title;
<h1><?= Html::encode($this->title) ?></h1>
<?php
<<<<<<< HEAD
if($model->status_request_sekertaris_rektorat == 'Menunggu') {
echo Html::a('Ubah', ['update-by-pegawai', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-primary']);
echo Html::a('Hapus', ['delete', 'id' => $model->transaksi_kendaraan_id], [
=======
if($model->status_request_sekertaris_rektorat == 'Pending') {
echo Html::a('Update', ['update-by-pegawai', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-primary']);
echo Html::a('Delete', ['delete', 'id' => $model->transaksi_kendaraan_id], [
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
'class' => 'btn btn-danger',
'data' => [
'confirm' => 'Are you sure you want to delete this item?',
'method' => 'post',
],
]);
<<<<<<< HEAD
}else if($model->status_request_sekertaris_rektorat == 'Diterima'){
=======
}else if($model->status_request_sekertaris_rektorat == 'Accepted'){
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
echo Html::a('Print', ['pegawai-pdf', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-warning']);
}
?>
......
backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/viewByPegawaiPdf.php
......@@ -6,8 +6,13 @@ use yii\widgets\DetailView;
/* @var $this yii\web\View */
/* @var $model backend\modules\ubux\models\UbuxTransaksiKendaraanMahasiswa */
<<<<<<< HEAD
$this->title = 'Permintaan Kendaraan Pegawai';
$this->params['breadcrumbs'][] = ['label' => 'Semua Permintaa Kendaraan Pegawai', 'url' => ['index-by-pegawai']];
=======
$this->title = 'Request Kendaraan Pegawai';
$this->params['breadcrumbs'][] = ['label' => 'Semua Request Pegawai', 'url' => ['index-by-pegawai']];
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="ubux-transaksi-kendaraan-mahasiswa-view">
......
backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/viewByPribadi.php
......@@ -6,6 +6,7 @@ use yii\widgets\DetailView;
/* @var $this yii\web\View */
/* @var $model backend\modules\ubux\models\UbuxTransaksiKendaraanMahasiswa */
<<<<<<< HEAD
$this->title = 'Permintaan Kendaraan Pribadi';
$this->params['breadcrumbs'][] = ['label' => 'Permintaan Kendaraan Pribadi', 'url' => ['index-by-pribadi']];
$this->params['breadcrumbs'][] = $this->title;
......@@ -18,13 +19,31 @@ $this->params['breadcrumbs'][] = $this->title;
if($model->status_request_sekertaris_rektorat == 'Menunggu' && $model->status_request_kemahasiswaan == 'Menunggu' && $model->status_request_hrd == 'Menunggu' && $model->status_request_kabiro_KSD == 'Menunggu' && $model->status_request_keuangan == 'Menunggu' && $model->status_request_wr2 == 'Menunggu') {
echo Html::a('Ubah', ['update', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-primary']);
echo Html::a('Hapus', ['delete', 'id' => $model->transaksi_kendaraan_id], [
=======
$this->title = $model->transaksi_kendaraan_id;
$this->params['breadcrumbs'][] = ['label' => 'Ubux Transaksi Kendaraan Pribadi', 'url' => ['index-by-pribadi']];
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="ubux-transaksi-kendaraan-mahasiswa-view">
<h1>Request Pribadi : <?= Html::encode($this->title) ?></h1>
<p>
<?php
if($model->status_request_sekertaris_rektorat == 'Pending' && $model->status_request_kemahasiswaan == 'Pending' && $model->status_request_hrd == 'Pending' && $model->status_request_kabiro_KSD == 'Pending' && $model->status_request_keuangan == 'Pending' && $model->status_request_wr2 == 'Pending') {
echo Html::a('Update', ['update', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-primary']);
echo Html::a('Delete', ['delete', 'id' => $model->transaksi_kendaraan_id], [
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
'class' => 'btn btn-danger',
'data' => [
'confirm' => 'Are you sure you want to delete this item?',
'method' => 'post',
],
]);
<<<<<<< HEAD
}else if($model->status_request_sekertaris_rektorat == 'Diterima' && $model->status_request_kemahasiswaan == 'Diterima' && $model->status_request_hrd == 'Diterima' && $model->status_request_kabiro_KSD == 'Diterima' && $model->status_request_keuangan == 'Diterima' && $model->status_request_wr2 == 'Diterima') {
=======
}else if($model->status_request_sekertaris_rektorat == 'Accepted' && $model->status_request_kemahasiswaan == 'Accepted' && $model->status_request_hrd == 'Accepted' && $model->status_request_kabiro_KSD == 'Accepted' && $model->status_request_keuangan == 'Accepted' && $model->status_request_wr2 == 'Accepted') {
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
echo Html::a('Print', ['pribadi-pdf', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-warning']);
}
?>
......
backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/viewByPribadiPdf.php
......@@ -6,8 +6,13 @@ use yii\widgets\DetailView;
/* @var $this yii\web\View */
/* @var $model backend\modules\ubux\models\UbuxTransaksiKendaraanMahasiswa */
<<<<<<< HEAD
$this->title = 'Permintaan Kendaraan Pribadi';
$this->params['breadcrumbs'][] = ['label' => 'Permintaan Kendaraan Pribadi', 'url' => ['index-by-pribadi']];
=======
$this->title = 'Request Pribadi';
$this->params['breadcrumbs'][] = ['label' => 'Ubux Transaksi Kendaraan Pribadi', 'url' => ['index-by-pribadi']];
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="ubux-transaksi-kendaraan-mahasiswa-view">
......
backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/viewBySekertarisRektorat.php
......@@ -6,8 +6,13 @@ use yii\widgets\DetailView;
/* @var $this yii\web\View */
/* @var $model backend\modules\ubux\models\UbuxTransaksiKendaraanMahasiswa */
<<<<<<< HEAD
$this->title = 'Pemintaan Kendaraan '.$model->role;
$this->params['breadcrumbs'][] = ['label' => 'Permintaan Kendaraan', 'url' => ['index-all']];
=======
$this->title = 'Request Kendaraan '.$model->transaksi_kendaraan_id;
$this->params['breadcrumbs'][] = ['label' => 'Request All', 'url' => ['index-all']];
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="ubux-transaksi-kendaraan-mahasiswa-view">
......@@ -15,8 +20,13 @@ $this->params['breadcrumbs'][] = $this->title;
<h1><?= Html::encode($this->title) ?></h1>
<?php
<<<<<<< HEAD
echo Html::a('Terima', ['accept-by-sekertaris-rektorat', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-success']);
echo Html::a('Tolak', ['reject-by-sekertaris-rektorat', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-danger']);
=======
echo Html::a('Accept', ['accept-by-sekertaris-rektorat', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-success']);
echo Html::a('Reject', ['reject-by-sekertaris-rektorat', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-danger']);
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
?>
<?= DetailView::widget([
......
backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/viewByWr2.php
......@@ -11,11 +11,19 @@ $this->params['breadcrumbs'][] = ['label' => 'Ubux Transaksi Kendaraan Pribadi',
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="ubux-transaksi-kendaraan-mahasiswa-view">
<<<<<<< HEAD
<h1><?= Html::encode($this->title) ?></h1>
<?php
echo Html::a('Ubah', ['accept-by-wr2', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-success']);
echo Html::a('Tolak', ['reject-by-wr2', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-danger']);
=======
<h1>Request Pribadi : <?= Html::encode($this->title) ?></h1>
<?php
echo Html::a('Accept', ['accept-by-wr2', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-success']);
echo Html::a('Reject', ['reject-by-wr2', 'id' => $model->transaksi_kendaraan_id], ['class' => 'btn btn-danger']);
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
?>
<?= DetailView::widget([
......
backend/modules/ubux/views/ubux-transaksi-kendaraan-mahasiswa/viewPdf.php
......@@ -6,6 +6,7 @@ use yii\widgets\DetailView;
/* @var $this yii\web\View */
/* @var $model backend\modules\ubux\models\UbuxTransaksiKendaraanMahasiswa */
<<<<<<< HEAD
$this->title = 'Permintaan Kendaraan Mahasiswa';
$this->params['breadcrumbs'][] = ['label' => 'Request Kendaraan Mahasiswa', 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
......@@ -113,6 +114,33 @@ $this->params['breadcrumbs'][] = $this->title;
// 'status_request_kemahasiswaan',
// 'role',
// 'no_telepon',
=======
$this->title = 'Request Kendaraan Mahasiswa';
$this->params['breadcrumbs'][] = ['label' => 'Ubux Transaksi Kendaraan Mahasiswa', 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="ubux-transaksi-kendaraan-mahasiswa-view">
<div>
<img src="gambar/itdel.jpg" style="width: 100px; width: 100px; float: left">
<h1 style="text-align: center; padding-top: 25px"><?= Html::encode($this->title) ?></h1>
</div>
<?= DetailView::widget([
'model' => $model,
'attributes' => [
// 'transaksi_kendaraan_id',
'nama_perequest_kendaraan',
'deskripsi_penggunaan_kendaraan',
'tujuan',
'jumlah_penumpang_kendaraan',
'rencana_waktu_keberangkatan',
'rencana_waktu_kembali',
'status_request_sekertaris_rektorat',
// 'status_request_kemahasiswa an',
// 'role',
'no_telepon',
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
// 'proposal',
// 'deleted',
// 'deleted_at',
......@@ -122,6 +150,7 @@ $this->params['breadcrumbs'][] = $this->title;
// 'updated_at',
// 'updated_by',
// 'kendaraan_id',
<<<<<<< HEAD
// [
// 'attribute' => 'Kendaraan',
// 'value' => $model->kendaraan->kendaraan,
......@@ -157,4 +186,18 @@ $this->params['breadcrumbs'][] = $this->title;
<td>www.del.ac.id</td>
</tr>
</table>
=======
[
'attribute' => 'Kendaraan',
'value' => $model->kendaraan->kendaraan,
],
[
'attribute' => 'Supir',
'value' => $model->supir->name_supir,
],
'No_Hp_Supir',
],
]) ?>
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
</div>
backend/themes/v2/layouts/main.php
......@@ -134,7 +134,11 @@ $this->beginPage();
'icon' => 'fa fa-user',
'childs' => [
[
<<<<<<< HEAD
'label' => 'Semua Permintaan',
=======
'label' => 'Semua Request',
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
'icon' => 'fa fa-users',
'url' => '/ubux/ubux-transaksi-kendaraan-mahasiswa/index-all',
],
......@@ -161,7 +165,11 @@ $this->beginPage();
'icon' => 'fa fa-user',
'childs' => [
[
<<<<<<< HEAD
'label' => 'Lihat Permintaan Mahasiswa',
=======
'label' => 'View Request Mahasiswa',
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
'icon' => 'fa fa-star',
'url' => '/ubux/ubux-transaksi-kendaraan-mahasiswa/index-by-kemahasiswaan',
],
......@@ -172,12 +180,20 @@ $this->beginPage();
'icon' => 'fa fa-user',
'childs' => [
[
<<<<<<< HEAD
'label' => 'Data Permintaan Pegawai',
=======
'label' => 'Data Request Pegawai',
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
'icon' => 'fa fa-star',
'url' => '/ubux/ubux-transaksi-kendaraan-mahasiswa/index-by-pegawai',
],
[
<<<<<<< HEAD
'label' => 'Permintaan Kendaraan Pegawai',
=======
'label' => 'Request Kendaraan Pegawai',
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
'icon' => 'fa fa-star',
'url' => '/ubux/ubux-transaksi-kendaraan-mahasiswa/create-by-pegawai',
],
......@@ -188,12 +204,20 @@ $this->beginPage();
'icon' => 'fa fa-users',
'childs' => [
[
<<<<<<< HEAD
'label' => 'Data Permintaan Kendaraan',
=======
'label' => 'Data Request Kendaraan',
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
'icon' => 'fa fa-star',
'url' => '/ubux/ubux-transaksi-kendaraan-mahasiswa/index',
],
[
<<<<<<< HEAD
'label' => 'Permintaan Kendaraan',
=======
'label' => 'Request Kendaraan',
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
'icon' => 'fa fa-star',
'url' => '/ubux/ubux-transaksi-kendaraan-mahasiswa/create',
],
......@@ -204,12 +228,20 @@ $this->beginPage();
'icon' => 'fa fa-user',
'childs' => [
[
<<<<<<< HEAD
'label' => 'Data Permintaan Pribadi',
=======
'label' => 'Data Request Pribadi',
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
'icon' => 'fa fa-star',
'url' => '/ubux/ubux-transaksi-kendaraan-mahasiswa/index-by-pribadi',
],
[
<<<<<<< HEAD
'label' => 'Permintaan Kendaraan Pribadi',
=======
'label' => 'Request Kendaraan Pribadi',
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
'icon' => 'fa fa-star',
'url' => '/ubux/ubux-transaksi-kendaraan-mahasiswa/create-by-pribadi',
],
......@@ -220,7 +252,11 @@ $this->beginPage();
'icon' => 'fa fa-users',
'childs' => [
[
<<<<<<< HEAD
'label' => 'Data Permintaan Kendaraan Pribadi',
=======
'label' => 'Data Request Kendaraan Pribadi',
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
'icon' => 'fa fa-star',
'url' => '/ubux/ubux-transaksi-kendaraan-mahasiswa/index-by-kabiro-ksd',
],
......@@ -231,7 +267,11 @@ $this->beginPage();
'icon' => 'fa fa-users',
'childs' => [
[
<<<<<<< HEAD
'label' => 'Data Permintaan Kendaraan Pribadi',
=======
'label' => 'Data Request Kendaraan Pribadi',
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
'icon' => 'fa fa-star',
'url' => '/ubux/ubux-transaksi-kendaraan-mahasiswa/index-by-hrd',
],
......@@ -242,7 +282,11 @@ $this->beginPage();
'icon' => 'fa fa-users',
'childs' => [
[
<<<<<<< HEAD
'label' => 'Data Permintaan Kendaraan Pribadi',
=======
'label' => 'Data Request Kendaraan Pribadi',
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
'icon' => 'fa fa-star',
'url' => '/ubux/ubux-transaksi-kendaraan-mahasiswa/index-by-keuangan',
],
......@@ -253,7 +297,11 @@ $this->beginPage();
'icon' => 'fa fa-users',
'childs' => [
[
<<<<<<< HEAD
'label' => 'Data Permintaan Kendaraan Pribadi',
=======
'label' => 'Data Request Kendaraan Pribadi',
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
'icon' => 'fa fa-star',
'url' => '/ubux/ubux-transaksi-kendaraan-mahasiswa/index-by-wr2',
],
......
common/components/ToolsColumn.php
......@@ -13,7 +13,11 @@ use yii\helpers\Url;
*/
class ToolsColumn extends \yii\grid\ActionColumn
{
<<<<<<< HEAD
public $header = 'Aksi';
=======
public $header = 'Action';
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
public $template = '';
/**
......@@ -32,7 +36,11 @@ class ToolsColumn extends \yii\grid\ActionColumn
{
if (!isset($this->buttons['view'])) {
$this->buttons['view'] = function ($url, $model) {
<<<<<<< HEAD
return "<li>".Html::a('<span class="glyphicon glyphicon-eye-open"></span> Lihat Rincian', $url, [
=======
return "<li>".Html::a('<span class="glyphicon glyphicon-eye-open"></span> View', $url, [
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
'title' => Yii::t('yii', 'View'),
'data-pjax' =>'0',
])."</li>";
......@@ -40,7 +48,11 @@ class ToolsColumn extends \yii\grid\ActionColumn
}
if (!isset($this->buttons['edit'])) {
$this->buttons['edit'] = function ($url, $model) {
<<<<<<< HEAD
return "<li>".Html::a('<span class="glyphicon glyphicon-pencil"></span> Ubah', $url, [
=======
return "<li>".Html::a('<span class="glyphicon glyphicon-pencil"></span> Edit', $url, [
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
'title' => Yii::t('yii', 'Edit'),
'data-pjax' => '0',
])."</li>";
......@@ -48,9 +60,15 @@ class ToolsColumn extends \yii\grid\ActionColumn
}
if (!isset($this->buttons['del'])) {
$this->buttons['del'] = function ($url, $model) {
<<<<<<< HEAD
return "<li>".Html::a('<span class="glyphicon glyphicon-trash"></span> Hapus', $url, [
'title' => Yii::t('yii', 'Delete'),
'data-confirm' => Yii::t('yii', 'Apakah anda yakin ingin menghapus ?'),
=======
return "<li>".Html::a('<span class="glyphicon glyphicon-trash"></span> Delete', $url, [
'title' => Yii::t('yii', 'Delete'),
'data-confirm' => Yii::t('yii', 'Are you sure you want to delete this item?'),
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
'data-method' => 'post',
'data-pjax' => '0',
])."</li>";
......@@ -61,7 +79,11 @@ class ToolsColumn extends \yii\grid\ActionColumn
}
if (!isset($this->buttons['acc'])) {
$this->buttons['acc'] = function ($url, $model) {
<<<<<<< HEAD
return "<li>".Html::a('<span class="glyphicon glyphicon-ok"></span> Terima', $url, [
=======
return "<li>".Html::a('<span class="glyphicon glyphicon-ok"></span> Accept', $url, [
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
'title' => Yii::t('yii', 'Accept'),
'data-pjax' => '0',
])."</li>";
......@@ -69,13 +91,21 @@ class ToolsColumn extends \yii\grid\ActionColumn
}
if (!isset($this->buttons['rej'])) {
$this->buttons['rej'] = function ($url, $model) {
<<<<<<< HEAD
return "<li>".Html::a('<span class="glyphicon glyphicon-remove"></span> Tolak', $url, [
=======
return "<li>".Html::a('<span class="glyphicon glyphicon-remove"></span> Reject', $url, [
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
'title' => Yii::t('yii', 'Reject'),
'data-pjax' => '0',
])."</li>";
};
}
<<<<<<< HEAD
=======
>>>>>>> 5e2de8d9f9d1ade4ad2a47ecb83d8d752c0cc136
}
......
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