Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
chat_webview
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
abookCommunication
chat_webview
Commits
777bacea
Commit
777bacea
authored
Apr 20, 2021
by
Lee Munkyeong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ユーザ初対バグ修正
parent
e8b1eec1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
73 additions
and
22 deletions
+73
-22
public_new/chat_add_user.html
+5
-5
public_new/js/chat-ui.js
+17
-17
public_new/template/template_add_user_group_list.html
+19
-0
public_new/template/template_add_user_group_path.html
+2
-0
public_new/template/template_add_user_group_user_list.html
+30
-0
No files found.
public_new/chat_add_user.html
View file @
777bacea
...
...
@@ -66,12 +66,12 @@
</div>
</div>
<div
class=
"tab_content"
id=
"tab2_content"
>
<div
class=
"breadcrumb"
id=
"groupPathAreaFor
MakeRoom
"
></div>
<div
class=
"breadcrumb"
id=
"groupPathAreaFor
AddUser
"
></div>
<div
class=
"chat_list"
>
<!-- 全グループ -->
<ul
class=
"p-0 chat_make_room_list"
>
<li
class=
"d-flex align-items-center"
id=
"rootGroupArea"
>
<a
href=
"#"
class=
"w-100"
id=
"rootGroupBtnFor
MakeRoom
"
>
<a
href=
"#"
class=
"w-100"
id=
"rootGroupBtnFor
AddUser
"
>
<div
class=
"chat_item d-flex flex-row align-items-center"
>
<div
class=
"chat_item_l"
>
<div
class=
"thumbnail"
>
...
...
@@ -89,7 +89,7 @@
</a>
</li>
<li
class=
"d-flex align-items-center"
id=
"parentGroupArea"
>
<a
href=
"#"
class=
"w-100"
id=
"parentGroupBtnFor
MakeRoom
"
>
<a
href=
"#"
class=
"w-100"
id=
"parentGroupBtnFor
AddUser
"
>
<div
class=
"chat_item d-flex flex-row align-items-center"
>
<div
class=
"chat_item_l"
>
<div
class=
"thumbnail"
>
...
...
@@ -106,8 +106,8 @@
</div>
</a>
</li>
<div
id=
"childGroupListAreaFor
MakeRoom
"
></div>
<div
id=
"userInGroupListFor
MakeRoom
"
></div>
<div
id=
"childGroupListAreaFor
AddUser
"
></div>
<div
id=
"userInGroupListFor
AddUser
"
></div>
</ul>
</div>
</div>
...
...
public_new/js/chat-ui.js
View file @
777bacea
...
...
@@ -2149,20 +2149,20 @@ CHAT_UI.refreshMyGroupForAddUser = function() {
// グループの様式を読み込む
var
groupTemplate
;
$
.
get
({
url
:
"./template/template_
make_room
_group_list.html"
,
async
:
false
}
$
.
get
({
url
:
"./template/template_
add_user
_group_list.html"
,
async
:
false
}
,
function
(
text
)
{
groupTemplate
=
text
;
});
// ユーザの様式を読み込む
var
userTemplate
;
$
.
get
({
url
:
"./template/template_
make_room
_user_list.html"
,
async
:
false
}
$
.
get
({
url
:
"./template/template_
add_user
_user_list.html"
,
async
:
false
}
,
function
(
text
)
{
userTemplate
=
text
;
});
var
groupUserTemplate
;
$
.
get
({
url
:
"./template/template_
make_room
_group_user_list.html"
,
async
:
false
}
$
.
get
({
url
:
"./template/template_
add_user
_group_user_list.html"
,
async
:
false
}
,
function
(
text
)
{
groupUserTemplate
=
text
;
});
...
...
@@ -2242,7 +2242,7 @@ CHAT_UI.refreshAllGroupForAddUser = function(paramGroupId) {
$
(
'.content'
).
removeClass
(
'none'
);
$
(
'.overlay_src_msg'
).
empty
();
$
(
'#tabAllGroupOnA
ll
User'
).
prop
(
'checked'
,
true
);
$
(
'#tabAllGroupOnA
dd
User'
).
prop
(
'checked'
,
true
);
//オンライン状態であればサーバから情報更新。
if
(
IS_ONLINE
==
'true'
)
{
...
...
@@ -2254,24 +2254,24 @@ CHAT_UI.refreshAllGroupForAddUser = function(paramGroupId) {
}
//画面エリアを初期化。
$
(
'#parentGroupBtnFor
MakeRoom
'
).
off
();
$
(
'#rootGroupBtnFor
MakeRoom
'
).
off
();
$
(
'#childGroupListAreaFor
MakeRoom
'
).
html
(
''
);
$
(
'#userInGroupListFor
MakeRoom
'
).
html
(
''
);
$
(
'#groupPathAreaFor
MakeRoom
'
).
html
(
''
);
$
(
'#parentGroupBtnFor
AddUser
'
).
off
();
$
(
'#rootGroupBtnFor
AddUser
'
).
off
();
$
(
'#childGroupListAreaFor
AddUser
'
).
html
(
''
);
$
(
'#userInGroupListFor
AddUser
'
).
html
(
''
);
$
(
'#groupPathAreaFor
AddUser
'
).
html
(
''
);
//DBからグループ情報を取得。
var
result
=
CHAT_DB
.
getGroupInfoForAddUser
(
groupId
);
//上位グループ、トップグループ遷移ボタンのイベント追加。
if
(
typeof
result
.
parentGroupId
!==
'undefined'
)
{
$
(
'#parentGroupBtnFor
MakeRoom
'
).
on
(
'click'
,
function
()
{
$
(
'#parentGroupBtnFor
AddUser
'
).
on
(
'click'
,
function
()
{
CHAT_UI
.
refreshAllGroupForAddUser
(
result
.
parentGroupId
);
});
}
if
(
typeof
result
.
rootGroupId
!==
'undefined'
)
{
if
(
paramGroupId
==
0
)
{
groupId
=
result
.
rootGroupId
}
$
(
'#rootGroupBtnFor
MakeRoom
'
).
on
(
'click'
,
function
()
{
$
(
'#rootGroupBtnFor
AddUser
'
).
on
(
'click'
,
function
()
{
CHAT_UI
.
refreshAllGroupForAddUser
(
result
.
rootGroupId
);
});
}
...
...
@@ -2284,7 +2284,7 @@ CHAT_UI.refreshAllGroupForAddUser = function(paramGroupId) {
}
//該当グループのパースを表示。
var
groupPathTemplate
;
$
.
get
({
url
:
"./template/template_
make_room
_group_path.html"
,
async
:
false
}
$
.
get
({
url
:
"./template/template_
add_user
_group_path.html"
,
async
:
false
}
,
function
(
text
)
{
groupPathTemplate
=
text
;
});
...
...
@@ -2297,14 +2297,14 @@ CHAT_UI.refreshAllGroupForAddUser = function(paramGroupId) {
id
:
groupPath
.
groupId
});
let
obj
=
jQuery
.
parseHTML
(
html
);
$
(
'#groupPathAreaFor
MakeRoom
'
).
append
(
obj
);
$
(
'#groupPathAreaFor
AddUser
'
).
append
(
obj
);
}
groupPathCount
++
;
})
//該当グループの下位グループ表示。
var
groupTemplate
;
$
.
get
({
url
:
"./template/template_
make_room
_group_list.html"
,
async
:
false
}
$
.
get
({
url
:
"./template/template_
add_user
_group_list.html"
,
async
:
false
}
,
function
(
text
)
{
groupTemplate
=
text
;
});
...
...
@@ -2318,12 +2318,12 @@ CHAT_UI.refreshAllGroupForAddUser = function(paramGroupId) {
let
obj
=
$
(
jQuery
.
parseHTML
(
html
)).
on
(
'click'
,
function
()
{
});
$
(
'#childGroupListAreaFor
MakeRoom
'
).
append
(
obj
);
$
(
'#childGroupListAreaFor
AddUser
'
).
append
(
obj
);
})
//該当グループの所属ユーザを表示。
var
userTemplate
;
$
.
get
({
url
:
"./template/template_
make_room
_user_list.html"
,
async
:
false
}
$
.
get
({
url
:
"./template/template_
add_user
_user_list.html"
,
async
:
false
}
,
function
(
text
)
{
userTemplate
=
text
;
});
...
...
@@ -2340,7 +2340,7 @@ CHAT_UI.refreshAllGroupForAddUser = function(paramGroupId) {
userList
:
result
.
groupUserList
});
let
obj
=
jQuery
.
parseHTML
(
html
);
$
(
'#userInGroupListFor
MakeRoom
'
).
append
(
obj
);
$
(
'#userInGroupListFor
AddUser
'
).
append
(
obj
);
};
CHAT_UI
.
refreshForOnline
=
function
()
{
...
...
public_new/template/template_add_user_group_list.html
0 → 100644
View file @
777bacea
<li
class=
"d-flex align-items-center"
>
<a
href=
"#"
class=
"w-100"
onclick=
"CHAT_UI.refreshAllGroupForAddUser({{id}});"
>
<div
class=
"chat_item d-flex flex-row align-items-center"
>
<div
class=
"chat_item_l"
>
<div
class=
"thumbnail"
>
<img
src=
"icon/icon_folder.png"
alt=
"フォルダ"
/>
</div>
</div>
<div
class=
"chat_item_m px-0"
>
<div
class=
"d-flex flex-column"
>
<div
class=
"chat_item_t"
>
<span
class=
"chat_item_ttl"
>
{{name}}
</span>
</div>
</div>
</div>
</div>
</a>
</li>
\ No newline at end of file
public_new/template/template_add_user_group_path.html
0 → 100644
View file @
777bacea
<a
href=
"#"
class=
"breadcrumb_item"
onclick=
"CHAT_UI.refreshAllGroupForAddUser({{id}});"
><span>
{{name}}
</span></a>
\ No newline at end of file
public_new/template/template_add_user_group_user_list.html
0 → 100644
View file @
777bacea
<div
class=
"category"
onclick=
"CHAT_UI.toggleCategory(this);"
><div
class=
"category_name"
><span>
{{groupName}}
</span></div></div>
<ul
class=
"p-0 chat_make_room_list"
>
{{#groupUserList}}
<li
class=
"d-flex align-items-center"
>
<div
class=
"chat_item d-flex flex-row align-items-center w-100"
onclick=
"CHAT_UI.checkForMakeChat({{shopMemberId}});"
>
<div
class=
"chat_item_l_chk"
>
<div
class=
"checkbox"
>
<label>
<input
type=
"checkbox"
id=
"checkbox{{shopMemberId}}"
name=
"checkbox[]"
class=
"checkbox-input checkbox{{shopMemberId}}"
onclick=
"CHAT_UI.checkForMakeChat({{shopMemberId}});"
{{
checked
}}
>
<span
class=
"checkbox-parts"
></span>
</label>
</div>
</div>
<div
class=
"chat_item_l"
>
<div
class=
"thumbnail"
>
<div
class=
"img_wrap"
><img
src=
"{{profileUrl}}"
onError=
"this.src='./img/noImage.png'"
/></div>
</div>
</div>
<div
class=
"chat_item_m"
>
<div
class=
"d-flex flex-column"
>
<div
class=
"chat_item_t"
>
<span
class=
"chat_item_ttl"
>
{{shopMemberName}}
</span>
</div>
</div>
</div>
</div>
</li>
{{/groupUserList}}
</ul>
\ No newline at end of file
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