latest changes are
このコミットが含まれているのは:
+75
-20
@@ -4,6 +4,14 @@ import {getData, getDataObj} from "./base.js";
|
|||||||
import {_serverUrl} from "./setting.js";
|
import {_serverUrl} from "./setting.js";
|
||||||
export var connection;
|
export var connection;
|
||||||
|
|
||||||
|
export function dateTimeFormat(dateTime) {
|
||||||
|
var date = moment.utc(dateTime).local();
|
||||||
|
var difmonths = moment().diff(date, "months");
|
||||||
|
if (difmonths == 0) {
|
||||||
|
return moment(dateTime).fromNow();
|
||||||
|
}
|
||||||
|
return date.format("DD MMM, YYYY HH:mm");
|
||||||
|
}
|
||||||
function createLoad(data) {
|
function createLoad(data) {
|
||||||
let html = "";
|
let html = "";
|
||||||
if (data.length != 0) {
|
if (data.length != 0) {
|
||||||
@@ -157,24 +165,46 @@ function loadData() {
|
|||||||
// Notifcations
|
// Notifcations
|
||||||
let bdyUI = '<div class="accordion" id="notifi-list">';
|
let bdyUI = '<div class="accordion" id="notifi-list">';
|
||||||
for (var i = 0; i < response.length; i++) {
|
for (var i = 0; i < response.length; i++) {
|
||||||
bdyUI += `<li class="item-li" id="${response[i].ReminderId}" data-ref="${response[i].RedirectOptions.RefId}" data-installedAppId="${response[i].RedirectOptions.InstalledAppId}" data-formId="${response[i].RedirectOptions.CreateFormId}">
|
bdyUI += `<li class="item-li" id="${
|
||||||
<div class="accordion-header" id="accHeader-${response[i].ReminderId}">
|
response[i].ReminderId
|
||||||
<div class="notifiListItms accordion-button collapsed" data-bs-toggle="collapse" data-bs-target="#collapse-${response[i].ReminderId}" aria-expanded="false" aria-controls="collapseOne">
|
}" data-ref="${
|
||||||
|
response[i].RedirectOptions.RefId
|
||||||
|
}" data-installedAppId="${
|
||||||
|
response[i].RedirectOptions.InstalledAppId
|
||||||
|
}" data-formId="${response[i].RedirectOptions.CreateFormId}">
|
||||||
|
<div class="accordion-header" id="accHeader-${
|
||||||
|
response[i].ReminderId
|
||||||
|
}">
|
||||||
|
<div class="notifiListItms accordion-button collapsed" data-bs-toggle="collapse" data-bs-target="#collapse-${
|
||||||
|
response[i].ReminderId
|
||||||
|
}" aria-expanded="false" aria-controls="collapseOne">
|
||||||
<div class="row m-0 w-100 p-0 ">
|
<div class="row m-0 w-100 p-0 ">
|
||||||
<div class="col-3 px-0 d-flex flex-row text-truncate">
|
<div class="col-3 px-0 d-flex flex-row text-truncate">
|
||||||
<input class="form-check-input mr-2" type="checkbox" value="" id="flexCheckDefault">
|
<input class="form-check-input mr-2" type="checkbox" value="" id="flexCheckDefault">
|
||||||
<div class="mx-3 w-75 text-truncate">
|
<div class="mx-3 w-75 text-truncate">
|
||||||
<span class="mx-1">${response[i].Subject}</span>
|
<span class="mx-1">${
|
||||||
|
response[i].Subject
|
||||||
|
}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-9 text-truncate d-flex justify-content-between">
|
<div class="col-9 text-truncate d-flex justify-content-between">
|
||||||
<span class="mx-1 w-mes">${response[i].Message}</span>
|
<span class="mx-1 w-mes">${
|
||||||
<span class="mx-1 t-sec-min">22 mins</span>
|
response[i].Message
|
||||||
|
}</span>
|
||||||
|
<span class="mx-1 t-sec-min">${dateTimeFormat(
|
||||||
|
response[i].ReminderDate
|
||||||
|
)}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="collapse-${response[i].ReminderId}" class="accordion-collapse collapse" aria-labelledby="accHeader-${response[i].ReminderId}" data-bs-parent="#notifi-list">
|
<div id="collapse-${
|
||||||
<div class="accordion-body" id="accBody${response[i].ReminderId}">
|
response[i].ReminderId
|
||||||
|
}" class="accordion-collapse collapse" aria-labelledby="accHeader-${
|
||||||
|
response[i].ReminderId
|
||||||
|
}" data-bs-parent="#notifi-list">
|
||||||
|
<div class="accordion-body" id="accBody${
|
||||||
|
response[i].ReminderId
|
||||||
|
}">
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -185,9 +215,7 @@ function loadData() {
|
|||||||
$(".bdy-ul").append(bdyUI);
|
$(".bdy-ul").append(bdyUI);
|
||||||
$('.sub-nav-item[data-buttonType="inbox"] .length').remove();
|
$('.sub-nav-item[data-buttonType="inbox"] .length').remove();
|
||||||
$('.sub-nav-item[data-buttonType="inbox"]').append(
|
$('.sub-nav-item[data-buttonType="inbox"]').append(
|
||||||
`<span class="length badge rounded-pill bg-light text-dark ml-auto">${
|
`<span class="length badge rounded-pill bg-light text-dark ml-auto"></span>`
|
||||||
$(".item-li").length
|
|
||||||
}</span>`
|
|
||||||
);
|
);
|
||||||
$(".notifiListItms").on("click", function () {
|
$(".notifiListItms").on("click", function () {
|
||||||
let _this = $(this).parents(".item-li");
|
let _this = $(this).parents(".item-li");
|
||||||
@@ -264,29 +292,56 @@ function loadData() {
|
|||||||
if (response.length != 0) {
|
if (response.length != 0) {
|
||||||
let _tskhtml = '<div class="accordion" id="task-list">';
|
let _tskhtml = '<div class="accordion" id="task-list">';
|
||||||
for (var i = 0; i < response.length; i++) {
|
for (var i = 0; i < response.length; i++) {
|
||||||
_tskhtml += `<li class="item-li" id="${response[i].ReminderId}" data-ref="${response[i].RedirectOptions.RefId}" data-installedAppId="${response[i].RedirectOptions.InstalledAppId}" data-formId="${response[i].RedirectOptions.CreateFormId}">
|
_tskhtml += `<li class="item-li" id="${
|
||||||
<div class="accordion-header" id="accHeader-${response[i].ReminderId}">
|
response[i].ReminderId
|
||||||
<div class="tskListItms accordion-button collapsed" data-bs-toggle="collapse" data-bs-target="#collapse-${response[i].ReminderId}" aria-expanded="false" aria-controls="collapseOne">
|
}" data-ref="${
|
||||||
|
response[i].RedirectOptions.RefId
|
||||||
|
}" data-installedAppId="${
|
||||||
|
response[i].RedirectOptions.InstalledAppId
|
||||||
|
}" data-formId="${response[i].RedirectOptions.CreateFormId}">
|
||||||
|
<div class="accordion-header" id="accHeader-${
|
||||||
|
response[i].ReminderId
|
||||||
|
}">
|
||||||
|
<div class="tskListItms accordion-button collapsed" data-bs-toggle="collapse" data-bs-target="#collapse-${
|
||||||
|
response[i].ReminderId
|
||||||
|
}" aria-expanded="false" aria-controls="collapseOne">
|
||||||
<div class="row m-0 w-100 p-0 ">
|
<div class="row m-0 w-100 p-0 ">
|
||||||
<div class="col-3 px-0 d-flex flex-row text-truncate">
|
<div class="col-3 px-0 d-flex flex-row text-truncate">
|
||||||
<input class="form-check-input" type="checkbox" value="" id="flexCheckDefault">
|
<input class="form-check-input" type="checkbox" value="" id="flexCheckDefault">
|
||||||
<div class="mx-3 w-75 text-truncat">
|
<div class="mx-3 w-75 text-truncat">
|
||||||
<span class="mx-1">${response[i].Subject}</span>
|
<span class="mx-1">${
|
||||||
|
response[i].Subject
|
||||||
|
}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-9 text-truncate d-flex justify-content-between">
|
<div class="col-9 text-truncate d-flex justify-content-between">
|
||||||
<span class="mx-1 w-mes">${response[i].Message}</span>
|
<span class="mx-1 w-mes">${
|
||||||
<span class="mx-1 t-sec-min">22 mins</span>
|
response[i].Message
|
||||||
|
}</span>
|
||||||
|
<span class="mx-1 t-sec-min">${dateTimeFormat(
|
||||||
|
response[i].ReminderDate
|
||||||
|
)}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="collapse-${response[i].ReminderId}" class="accordion-collapse collapse" aria-labelledby="accHeader-${response[i].ReminderId}" data-bs-parent="#notifi-list">
|
<div id="collapse-${
|
||||||
<div class="accordion-body" id="accBody${response[i].ReminderId}">
|
response[i].ReminderId
|
||||||
|
}" class="accordion-collapse collapse" aria-labelledby="accHeader-${
|
||||||
|
response[i].ReminderId
|
||||||
|
}" data-bs-parent="#notifi-list">
|
||||||
|
<div class="accordion-body" id="accBody${
|
||||||
|
response[i].ReminderId
|
||||||
|
}">
|
||||||
<ul class="p-0 m-0 d-flex flex-row justify-content-between">
|
<ul class="p-0 m-0 d-flex flex-row justify-content-between">
|
||||||
<li class="mx-2 btn-outline-success btn btn-sm">Confirm</li>
|
<li class="mx-2 btn-outline-success btn btn-sm">Confirm</li>
|
||||||
<li class="mx-2 btn-outline-danger btn btn-sm">Reject</li>
|
<li class="mx-2 btn-outline-danger btn btn-sm">Reject</li>
|
||||||
<li class="mx-2 btn-outline-primary btn btn-sm">Close</li>
|
<li class="mx-2 btn-outline-primary btn btn-sm">Close</li>
|
||||||
<li class="mx-2 btn-outline-info detailBtn btn btn-sm" data-appId="${response[i].RedirectOptions.InstalledAppId}" data-recordId="${response[i].RedirectOptions.RefId}">Details-Page</li>
|
<li class="mx-2 btn-outline-info detailBtn btn btn-sm" data-appId="${
|
||||||
|
response[i].RedirectOptions
|
||||||
|
.InstalledAppId
|
||||||
|
}" data-recordId="${
|
||||||
|
response[i].RedirectOptions.RefId
|
||||||
|
}">Details-Page</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
ファイル差分が大きすぎるため省略します
差分を読み込み
+2
-2
@@ -2,8 +2,8 @@ export function _serverUrl() {
|
|||||||
// sachin 2.0 commitw
|
// sachin 2.0 commitw
|
||||||
// sudheer 1.0 new branch
|
// sudheer 1.0 new branch
|
||||||
// merge request another time
|
// merge request another time
|
||||||
//return "http://localhost:3088/";
|
return "http://localhost:3088/";
|
||||||
//return "http://localhost:3086/";
|
//return "http://localhost:3086/";
|
||||||
return "https://c02.bizgaze.app/";
|
//return "https://c02.bizgaze.app/";
|
||||||
//return "https://dev.bizgaze.app/";
|
//return "https://dev.bizgaze.app/";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,6 +15,7 @@
|
|||||||
<script src="../assets/js/bootstrap/bootstrap.bundle.min.js" defer></script>
|
<script src="../assets/js/bootstrap/bootstrap.bundle.min.js" defer></script>
|
||||||
<script src="../assets/js/cryptojs/cryptojs.js" defer></script>
|
<script src="../assets/js/cryptojs/cryptojs.js" defer></script>
|
||||||
<script src="../assets/js/signalr/signalr.js" defer></script>
|
<script src="../assets/js/signalr/signalr.js" defer></script>
|
||||||
|
<script src="../assets/js/moment/moment.js" defer></script>
|
||||||
<script type="module" src="../assets/js/home.js" defer></script>
|
<script type="module" src="../assets/js/home.js" defer></script>
|
||||||
<!-- <script src="../assets/js/cookiehelper.js"></script> -->
|
<!-- <script src="../assets/js/cookiehelper.js"></script> -->
|
||||||
<!-- <script src="../assets/js/base.js" defer></script> -->
|
<!-- <script src="../assets/js/base.js" defer></script> -->
|
||||||
|
|||||||
新しいイシューから参照
ユーザーをブロックする