Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
check
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_web
check
Commits
f934c42d
Commit
f934c42d
authored
2 years ago
by
Kang Donghun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
design patch and add error log
parent
43194926
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
192 additions
and
30 deletions
+192
-30
abweb/common/css/newdash/app.css
+24
-24
abweb/common/js/common.js
+1
-0
abweb/common/js/web/common.js
+160
-0
abweb/html/dashboard.html
+1
-1
abweb/html/pickup.html
+1
-1
abweb/html/push-message-detail.html
+1
-1
abweb/html/push-message-list.html
+1
-1
abweb/html/send-message.html
+1
-1
abweb/js/login/login.js
+2
-1
No files found.
abweb/common/css/newdash/app.css
View file @
f934c42d
This diff is collapsed.
Click to expand it.
abweb/common/js/common.js
View file @
f934c42d
...
...
@@ -293,6 +293,7 @@
let
params
=
{};
params
.
sid
=
COMMON
.
getSid
;
const
url
=
COMMON
.
format
(
ClientData
.
conf_checkApiUrl
(),
ClientData
.
userInfo_accountPath
())
+
CONSTANT
.
URL
.
CMS
.
API
.
AUTH_SESSION
;
console
.
log
(
"kdh check url : "
+
url
);
COMMON
.
cmsAjax
(
url
,
params
,
async
,
null
,
function
()
{
COMMON
.
goUrlWithCurrentParams
(
CONSTANT
.
PAGE_NAME
.
LOGIN
);
});
...
...
This diff is collapsed.
Click to expand it.
abweb/common/js/web/common.js
0 → 100644
View file @
f934c42d
$
(
function
(){
hide_del_btn
();
});
// 追加ボタン押下
$
(
'.add'
).
on
(
'click'
,
function
(){
var
base
=
$
(
this
).
parent
().
parent
().
parent
(
'.tb-item'
);
base
.
find
(
'.del'
).
show
();
// 入力フォームをクローン
base
.
clone
(
true
).
insertAfter
(
base
);
// 追加した要素にスクロール
$
(
"html,body"
).
animate
({
scrollTop
:
base
.
next
().
offset
().
top
});
// 入力フォームアコーディオン表示
base
.
parent
().
parent
(
'.tb'
).
find
(
'.ac-tb-form'
).
show
();
});
// 削除ボタン押下
$
(
'.del'
).
on
(
'click'
,
function
(){
var
base
=
$
(
this
).
parent
().
parent
().
parent
(
'.tb-item'
);
var
tbwrap
=
base
.
parent
(
'.tb-wrap'
);
var
tb
=
tbwrap
.
parent
(
'.tb'
);
// エリアの削除
base
.
remove
();
// ボタンの表示非表示切り替え
hide_del_btn
();
// フォームエリア表示切り替え
tbWrapClear
(
tbwrap
);
// 折りたたみアイコン非表示
if
(
tb
.
find
(
'.ac-tb-form'
).
is
(
':hidden'
)){
tb
.
find
(
'.fold-area'
).
addClass
(
'hide'
);
}
});
// 閉じるボタン押下
$
(
'.close-window'
).
on
(
'click'
,
function
(){
window
.
close
();
});
// 表領域のフォームが一つの時、削除ボタンを非表示
function
hide_del_btn
(){
$
(
'.tb-wrap'
).
each
(
function
(
i
,
elem
){
var
len
=
$
(
elem
).
find
(
'.tb-item'
).
length
;
//表の項目が一つの場合
if
(
len
<=
1
){
$
(
elem
).
find
(
'.del'
).
hide
();
$
(
this
).
children
(
'.tb-item'
).
removeClass
(
'visually-hidden'
);
// 入力フォームアコーディオン非表示
$
(
this
).
parent
().
find
(
'.ac-tb-form'
).
hide
();
}
});
}
// アコーディオンを閉めている際にフォームを削除した場合
// 子要素がすべて非表示の場合、親要素を非表示とする
function
tbWrapClear
(
tbwrap
){
if
(
tbwrap
.
children
(
':not(.visually-hidden)'
).
length
==
0
){
tbwrap
.
addClass
(
"visually-hidden"
);
}
else
{
tbwrap
.
removeClass
(
"visually-hidden"
);
}
}
// 入力フォームアコーディオン
$
(
'.ac-tb-form'
).
on
(
'click'
,
function
(){
var
tb
=
$
(
this
).
parent
().
parent
().
parent
(
'.tb'
);
var
elems
=
tb
.
find
(
'.tb-wrap'
).
find
(
'.tb-item'
);
var
tbwrap
=
tb
.
find
(
'.tb-wrap'
);
if
(
!
$
(
this
).
hasClass
(
'hide'
)){
elems
.
each
(
function
(
i
)
{
i
=
i
+
1
;
if
(
i
!=
elems
.
size
()){
$
(
this
).
addClass
(
'visually-hidden'
);
}
});
$
(
this
).
text
(
'開く'
);
// フォームエリア表示切り替え
tbWrapClear
(
tbwrap
);
// 折りたたみアイコン表示
tb
.
find
(
'.fold-area'
).
removeClass
(
'hide'
);
}
else
{
elems
.
removeClass
(
'visually-hidden'
);
$
(
this
).
text
(
'閉じる'
);
// フォームエリア表示切り替え
tbWrapClear
(
tbwrap
);
// 折りたたみアイコン非表示
tb
.
find
(
'.fold-area'
).
addClass
(
'hide'
);
}
// 開閉
$
(
this
).
toggleClass
(
"hide"
);
});
// トグル切り替え
$
(
".toggle"
).
on
(
"click"
,
function
()
{
$
(
this
).
toggleClass
(
"checked"
);
if
(
!
$
(
'input[name="check"]'
).
prop
(
"checked"
))
{
$
(
".toggle input"
).
prop
(
"checked"
,
true
);
}
else
{
$
(
".toggle input"
).
prop
(
"checked"
,
false
);
}
});
// メニュー表示
$
(
'.c-dropdown-trigger'
).
on
(
"click"
,
function
(){
$
(
'[data-target="'
+
$
(
this
).
attr
(
'id'
)
+
'"]'
).
toggleClass
(
'show'
);
$
(
'.mask'
).
removeClass
(
'hide'
);
});
// メニューを閉じる
$
(
'.mask'
).
on
(
"click"
,
function
(){
$
(
'.mask'
).
addClass
(
'hide'
);
$
(
'.c-dropdown-menu'
).
removeClass
(
'show'
);
});
// カードリスト選択
$
(
'.select-card-list .card .select-label'
).
on
(
"click"
,
function
(){
$
(
this
).
closest
(
'.select-card-list'
).
find
(
'.card'
).
removeClass
(
'selected'
);
$
(
this
).
closest
(
'.card'
).
addClass
(
'selected'
);
});
// リスト表示切替(リスト表示)
$
(
'.view-menu .view-list-btn'
).
on
(
"click"
,
function
(){
$
(
'.view-block-btn'
).
removeClass
(
'active'
);
$
(
'.view-list-btn'
).
addClass
(
'active'
);
$
(
'.view-content'
).
removeClass
(
'view-block'
);
$
(
'.view-content'
).
addClass
(
'view-list'
);
});
// リスト表示切替(グリッド表示)
$
(
'.view-menu .view-block-btn'
).
on
(
"click"
,
function
(){
$
(
'.view-list-btn'
).
removeClass
(
'active'
);
$
(
'.view-block-btn'
).
addClass
(
'active'
);
$
(
'.view-content'
).
removeClass
(
'view-list'
);
$
(
'.view-content'
).
addClass
(
'view-block'
);
});
// ローディング
$
(
function
(){
function
e
()
{
setTimeout
(
function
(){
$
.
LoadingOverlay
(
"hide"
);
},
2000
);
}
$
(
".search-form-btn"
).
on
(
'click'
,
function
(){
$
.
LoadingOverlay
(
"show"
,
{
image
:
"img/loading.gif"
});
e
();
});
});
This diff is collapsed.
Click to expand it.
abweb/html/dashboard.html
View file @
f934c42d
...
...
@@ -42,7 +42,7 @@
<div
id=
"includedMainTitle"
></div>
<!-- dashboard -->
<main>
<div
class=
"container"
>
<div
class=
"container
-wrap
"
>
<!-- sub title -->
<h2
class=
"fs-8 font-weight-bold lang"
id=
"#pickupHeader"
lang=
"pickup"
></h2>
...
...
This diff is collapsed.
Click to expand it.
abweb/html/pickup.html
View file @
f934c42d
...
...
@@ -50,7 +50,7 @@
<div
id=
"includedMainTitle"
></div>
<!-- pickup -->
<main>
<div
class=
"container"
>
<div
class=
"container
-wrap
"
>
<!-- tab -->
<ul
class=
"nav nav-tabs line"
id=
"myTab"
role=
"tablist"
>
<li
class=
"nav-item"
id=
"liTabNewReport"
>
...
...
This diff is collapsed.
Click to expand it.
abweb/html/push-message-detail.html
View file @
f934c42d
...
...
@@ -42,7 +42,7 @@
<div
id=
"includedMainTitle"
></div>
<!-- message detail -->
<main>
<div
class=
"container"
>
<div
class=
"container
-wrap
"
>
<div
class=
"row"
>
<div
class=
"col-12"
>
<div
class=
"card p-4"
>
...
...
This diff is collapsed.
Click to expand it.
abweb/html/push-message-list.html
View file @
f934c42d
...
...
@@ -42,7 +42,7 @@
<div
id=
"includedMainTitle"
></div>
<!-- message list -->
<main>
<div
class=
"container"
>
<div
class=
"container
-wrap
"
>
<!-- message -->
<ul
class=
"card-list message-list p-0"
id=
"messageList"
>
<li
class=
"card mb-2 not-found d-none"
>
...
...
This diff is collapsed.
Click to expand it.
abweb/html/send-message.html
View file @
f934c42d
...
...
@@ -44,7 +44,7 @@
<div
id=
"includedMainTitle"
></div>
<!-- send message -->
<main>
<div
class=
"container"
>
<div
class=
"container
-wrap
"
>
<!-- content -->
<div
class=
"py-2"
>
<div
class=
"row"
>
...
...
This diff is collapsed.
Click to expand it.
abweb/js/login/login.js
View file @
f934c42d
...
...
@@ -533,7 +533,8 @@ LOGIN.ready = function() {
I18N
.
initi18n
();
var
sysSettings
=
COMMON
.
sysSetting
();
// get info in conf.json
console
.
log
(
"kdh check apiUrl : "
+
sysSettings
.
apiUrl
);
console
.
log
(
"kdh check checkApiUrl : "
+
sysSettings
.
checkApiUrl
);
// check an getits setting
if
(
sysSettings
.
apiUrl
==
""
)
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment