Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
sheillendra committed Jun 4, 2024
1 parent 7451154 commit 4e29652
Show file tree
Hide file tree
Showing 12 changed files with 35 additions and 31 deletions.
Binary file not shown.
2 changes: 1 addition & 1 deletion demos/assets/js/jeasyui/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ window.yii.app = (($) => {
//return refAjax(callback, 'satker', { r: 'v1/satker', fields: 'id, nama', 'per-page': 50 }, 'id', 'nama');

//demo purpose
return refAjax(callback, 'satker', { r: 'ref-satker.json', fields: 'id, nama', 'per-page': 50 }, 'id', 'nama');
return refSatker;
},
};

Expand Down
38 changes: 17 additions & 21 deletions demos/assets/js/jeasyui/operasi.js
Original file line number Diff line number Diff line change
Expand Up @@ -429,15 +429,12 @@ window.yii.app.operasi = (function ($) {
var initDg = () => {
dg = el.find('#operasi-dg');
dg.datagrid({
//demos purpose
url: yii.easyui.getHost('api') + '/operasi-ext-satker.json',

// url: yii.easyui.getHost('api'),
queryParams: yii.easyui.ajaxAuthToken({
r: 'v1/jeasyui/operasi',
expand: 'satker',
fields: 'id, sandi, satker_id, tanggal_mulai, tanggal_selesai, satker.nama',
}),
// queryParams: yii.easyui.ajaxAuthToken({
// r: 'v1/jeasyui/operasi',
// expand: 'satker',
// fields: 'id, sandi, satker_id, tanggal_mulai, tanggal_selesai, satker.nama',
// }),
method: 'get',
fit: true,
border: false,
Expand Down Expand Up @@ -510,24 +507,21 @@ window.yii.app.operasi = (function ($) {
dgRow = row;
pg.propertygrid('loadData', pgData(row));
giatDg.datagrid({
//demo purpose
url: yii.easyui.getHost('api') + '/operasi-giat.json',

//url: yii.easyui.getHost('api'),
queryParams: yii.easyui.ajaxAuthToken({
r: 'v1/jeasyui/operasi-giat',
operasi_id: row.id
})
// queryParams: yii.easyui.ajaxAuthToken({
// r: 'v1/jeasyui/operasi-giat',
// operasi_id: row.id
// })

data: opGiat
});
dokumenDg.datagrid('addFilterRule', { field: 'operasi_id', op: 'equal', value: row.id });
dokumenDg.datagrid({
// demo purpose
url: yii.easyui.getHost('api') + '/operasi-dokumen.json',

//url: yii.easyui.getHost('api'),
queryParams: yii.easyui.ajaxAuthToken({
r: 'v1/jeasyui/operasi-dokumen',
})
// queryParams: yii.easyui.ajaxAuthToken({
// r: 'v1/jeasyui/operasi-dokumen',
// })
data: opDoc
});
},
onLoadSuccess: function (data) {
Expand Down Expand Up @@ -818,6 +812,8 @@ window.yii.app.operasi = (function ($) {

initGiatDg();
initDocDg();

dg.datagrid({data: opSatker})
},
dokumenPreview: (data) => {
return dokumenPreview(data);
Expand Down
1 change: 0 additions & 1 deletion demos/data/login-error.json

This file was deleted.

1 change: 0 additions & 1 deletion demos/data/login-success.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
opDoc = {
"rows": [
{
"id": 3,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
opSatker = {
"rows": [
{
"id": 1,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
opGiat = {
"rows": [],
"_links": {
"self": {
Expand Down
2 changes: 1 addition & 1 deletion demos/data/ref-satker.json → demos/data/ref-satker.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[
refSatker = [
{
"id": "23",
"nama": "POLDA GORONTALO"
Expand Down
8 changes: 8 additions & 0 deletions demos/pages/operasi.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
<script src="../../src/assets/dist/js/yii.easyui.min.js"></script>
<script src="../../demos/assets/js/jeasyui/app.js"></script>
<script src="../../demos/assets/js/jeasyui/operasi.js"></script>
<script src="../../demos/data/operasi-dokumen.js"></script>
<script src="../../demos/data/operasi-ext-satker.js"></script>
<script src="../../demos/data/operasi-giat.js"></script>
<script src="../../demos/data/ref-satker.js"></script>
<script>
yii.easyui.tabInit = function(){
yii.app.operasi.init();
Expand Down Expand Up @@ -112,6 +116,10 @@
yii.easyui.setHost('api', '../../demos/data');
yii.easyui.setHost('backend', 'backend.html');
yii.easyui.setHost('frontend', 'frontend.html');

//demo purpose only
window.localStorage.setItem("token", "adsfasdf");

yii.easyui.init();
});</script>
</body>
Expand Down
6 changes: 4 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,14 @@
<script src="src/assets/dist/js/yii.easyui-login.if.min.js"></script>
<script>jQuery(function ($) {
yii.easyuiLogin.header = '<div id="login-header"> <img src="demos/assets/images/logo.png" style="height: 100px;"> <h1>SIMOPS - <span style="color: white;border-radius: 15px;background-color: red;padding: 6px;font-size: 9px;vertical-align: top;margin-top: 10px;">PRESISI</span></h1> <h2 style="margin-top: 20px;">Sistem Informasi dan Manajemen Operasi Kepolisian</h2> <h2 style="margin-top: 20px;">Polda Gorontalo</h2> </div>';
yii.easyuiLogin.content = '<form id="login-form" action="demos/data/login-success.json" method="get"> <input type="hidden" name="_csrf-backend" value="qaDFKDCvTcBRuqvfAk5ZWOjHsxp49Z5qPxnW7Rmw37CfzZxvWv4lkQWN4oBkKx8ckr_najCPxgdcKrKlboCr0g=="><table width="100%"> <tbody> <tr> <td colspan="3"><i>Please enter your username and password</i></td> </tr> <tr> <td width="80px"><label for="loginform-username">Username</label></td> <td>:</td> <td><input type="text" id="loginform-username" name="LoginForm[username]"></td> </tr> <tr> <td><label for="loginform-password">Password</label></td> <td>:</td> <td><input type="text" id="loginform-password" name="LoginForm[password]" value=""></td> </tr> <tr> <td></td> <td></td> <td><input type="hidden" name="LoginForm[rememberMe]" value="0"><label><input type="checkbox" id="loginform-rememberme" name="LoginForm[rememberMe]" value="1" checked> Remember Me</label></td> </tr> </tbody> </table> </form>';
//yii.easyuiLogin.content = '<form id="login-form" action="demos/data/login-success.json" method="post"> <input type="hidden" name="_csrf-backend" value="qaDFKDCvTcBRuqvfAk5ZWOjHsxp49Z5qPxnW7Rmw37CfzZxvWv4lkQWN4oBkKx8ckr_najCPxgdcKrKlboCr0g=="><table width="100%"> <tbody> <tr> <td colspan="3"><i>Please enter your username and password</i></td> </tr> <tr> <td width="80px"><label for="loginform-username">Username</label></td> <td>:</td> <td><input type="text" id="loginform-username" name="LoginForm[username]"></td> </tr> <tr> <td><label for="loginform-password">Password</label></td> <td>:</td> <td><input type="text" id="loginform-password" name="LoginForm[password]" value=""></td> </tr> <tr> <td></td> <td></td> <td><input type="hidden" name="LoginForm[rememberMe]" value="0"><label><input type="checkbox" id="loginform-rememberme" name="LoginForm[rememberMe]" value="1" checked> Remember Me</label></td> </tr> </tbody> </table> </form>';
//demo purpose
yii.easyuiLogin.content = '<form id="login-form" action="demos/pages/operasi.html" method="get"> <input type="hidden" name="_csrf-backend" value="qaDFKDCvTcBRuqvfAk5ZWOjHsxp49Z5qPxnW7Rmw37CfzZxvWv4lkQWN4oBkKx8ckr_najCPxgdcKrKlboCr0g=="><table width="100%"> <tbody> <tr> <td colspan="3"><i>Please enter your username and password</i></td> </tr> <tr> <td width="80px"><label for="loginform-username">Username</label></td> <td>:</td> <td><input type="text" id="loginform-username" name="LoginForm[username]"></td> </tr> <tr> <td><label for="loginform-password">Password</label></td> <td>:</td> <td><input type="text" id="loginform-password" name="LoginForm[password]" value=""></td> </tr> <tr> <td></td> <td></td> <td><input type="hidden" name="LoginForm[rememberMe]" value="0"><label><input type="checkbox" id="loginform-rememberme" name="LoginForm[rememberMe]" value="1" checked> Remember Me</label></td> </tr> </tbody> </table> </form>';
yii.easyuiLogin.dialogTitle = 'Login';
yii.easyuiLogin.dialogWidth = 350;
yii.easyuiLogin.dialogHeight = 430;
yii.easyuiLogin.usernameSelector = '#loginform-username';
yii.easyuiLogin.url = 'demos/data/login-success.html';
yii.easyuiLogin.url = 'demos/pages/operasi.html';
yii.easyuiLogin.signupurl = 'demos/page/signup';
yii.easyuiLogin.forgoturl = 'demos/page/forgot-password';
yii.easyuiLogin.init();
Expand Down
2 changes: 1 addition & 1 deletion src/assets/dist/js/yii.easyui-login.if.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 4e29652

Please sign in to comment.