From c68018d100c7c5701ad15dbd37801c0466a1f986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=98=89=E7=A5=A5=20=E8=A9=B9?= Date: Thu, 18 Apr 2024 19:20:21 +0800 Subject: [PATCH] updates --- Models/kolProjectDetail.cs | 7 + Views/Home/KolList.cshtml | 165 ++++++++++++++++++++ appsettings.json | 4 +- wwwroot/assets/javascript/custom/kollist.js | 149 +++++++++++++++++- 4 files changed, 322 insertions(+), 3 deletions(-) diff --git a/Models/kolProjectDetail.cs b/Models/kolProjectDetail.cs index ce80c42..037fd70 100644 --- a/Models/kolProjectDetail.cs +++ b/Models/kolProjectDetail.cs @@ -15,6 +15,7 @@ public class kolProjectDetail public List kolProjectPrices = new List(); public List kolProjectEvaluates = new List(); public List kolCooperateTypes = new List(); + public List kolCooperateTypeDetails = new List(); public List kolProjectFiles = new List(); public project project = new project(); @@ -33,6 +34,12 @@ public class kolProjectDetail kolCooperateTypes = conn.Query("select * from kolCooperateType where kolProject_uid = @kolProject_uid", new { kolProject_uid = kolProject_uid }).ToList(); kolProjectFiles = conn.Query("select * from kolProjectFile where kolProject_uid = @kolProject_uid", new { kolProject_uid = kolProject_uid }).ToList(); + foreach (kolCooperateType objData in kolCooperateTypes) + { + kolCooperateTypeDetail objItem = new kolCooperateTypeDetail(objData); + kolCooperateTypeDetails.Add(objItem); + } + project = conn.QueryFirst("select * from project where project_uid = @project_uid ", new { project_uid = kolProject.project_uid }); diff --git a/Views/Home/KolList.cshtml b/Views/Home/KolList.cshtml index 030502b..f10dd2f 100644 --- a/Views/Home/KolList.cshtml +++ b/Views/Home/KolList.cshtml @@ -1078,3 +1078,168 @@ + + +
+ +
\ No newline at end of file diff --git a/appsettings.json b/appsettings.json index 0c62f62..ff63115 100644 --- a/appsettings.json +++ b/appsettings.json @@ -7,9 +7,9 @@ }, "AllowedHosts": "*", "ConnectionStrings": { - "SQLConnectionString": "Data Source=sql.bremen.com.tw;Initial Catalog=journeys_wanthome;User ID=journeys_wanthome;Password=2icR52n@9;Max Pool Size=100;", + "SQLConnectionString": "Data Source=sql.bremen.com.tw;Initial Catalog=journeys_wanthome;User ID=journeys_wanthome;Password=2icR52n@9;Max Pool Size=250;", "ElabConnectionString": "Data Source=sql.bremen.com.tw;database=elab;uid=elab;pwd=2#2k9Vfg", - "DBConnectionString": "Data Source=sql.bremen.com.tw;Initial Catalog=prm;User ID=prm;Password=y6U6x?t5;Max Pool Size=200;" + "DBConnectionString": "Data Source=sql.bremen.com.tw;Initial Catalog=prm;User ID=prm;Password=y6U6x?t5;Max Pool Size=250;" }, "Admin": { "uid": "system", diff --git a/wwwroot/assets/javascript/custom/kollist.js b/wwwroot/assets/javascript/custom/kollist.js index 9611554..b800434 100644 --- a/wwwroot/assets/javascript/custom/kollist.js +++ b/wwwroot/assets/javascript/custom/kollist.js @@ -1146,6 +1146,9 @@ $(document).ready(function () { $('#dt-responsive-kolProject').on('click', 'button', function () { kolProjectTableButtonClick(this); }); + $('#dt-responsive-kolProject').on('click', 'a', function () { + kolProjectTableButtonClick(this); + }); }, order: [[4, 'desc']], info: false, @@ -1160,7 +1163,7 @@ $(document).ready(function () { render: function render(data, type, row, meta) { - return row.project.project_name; + return '' + row.project.project_name + ''; } }, @@ -1497,6 +1500,150 @@ function kolProjectTableButtonClick(obj) { kolProjectRowID = $('#' + uid); kolProjectPos = kolProjectTable.fnGetPosition($('#' + uid)[0]); + if (type == "preview") { + var formData = { + method: "get", + kolProject_uid: uid + } + + $.ajax({ + url: "/Api/kolProjectAddEditDelGet", + type: "post", + data: formData, + success: function (data, textStatus, jqXHR) { + if (data.ret == "yes") { + var trList = $("#previewPrice_table").find("tbody").find("tr"); + $.each(trList, function (index, item) { + $(item).remove(); + }); + + var trList = $("#previewFile_table").find("tbody").find("tr"); + $.each(trList, function (index, item) { + $(item).remove(); + }); + + var trList = $("#previewLink_table").find("tbody").find("tr"); + $.each(trList, function (index, item) { + $(item).remove(); + }); + + var trList = $("#previewCut_table").find("tbody").find("tr"); + $.each(trList, function (index, item) { + $(item).remove(); + }); + + var obj = data.data; + + + $('#previewProject_name').val('(' + obj.project.project_year + '年度' + obj.project.project_month + '月) ' + obj.project.project_name); + + var cooperStr = ''; + + $.each(obj.kolCooperateTypeDetails, function () { + cooperStr += this.optionItem_name + '/'; + }); + + cooperStr = cooperStr.replace(/\/+$/, ''); + + $('#previewProject_Cooper').val(cooperStr); + + $.each(obj.kolProjectPrices, function () { + var trHtml = ""; + trHtml += ''; + trHtml += ' ' + this.optionItem_name + ' '; + trHtml += ' ' + this.mediaItem_name + ' '; + trHtml += ' ' + this.kolProjectPrice_num + ' '; + trHtml += ' ' + AppendComma(this.kolProjectPrice_cost) + ' '; + trHtml += ' ' + this.kolProjectPrice_date + ' '; + + trHtml += ''; + + $('#previewPrice_table tbody').append(trHtml); + }); + + if (obj.kolProject.kolProject_isExec == 'Y') { + $('#previewProject_isCooper').val('是'); + } else { + $('#previewProject_isCooper').val('否'); + + if (obj.kolProject.kolProject_noExecReason != '') { + $('#previewProject_isCooper').val('否，原因【' + obj.kolProject.kolProject_noExecReason + '】'); + } + } + + $.each(obj.kolProjectFiles, function () { + var ret = ''; + + ret += ' ' + this.kolProjectFile_originFileName + ''; + + + var trHtml = ""; + trHtml += ''; + trHtml += ' ' + ret + ' '; + trHtml += ''; + + $('#previewFile_table tbody').append(trHtml); + }); + + var qualityStr = ''; + + $.each(obj.kolProjectEvaluates, function (key, value) { + qualityStr += value.kolProjectEvaluate_text + "/"; + }); + + qualityStr = qualityStr.replace(/\/+$/, ''); + + $('#previewProject_Quality').val(qualityStr); + + $.each(obj.kolProjectLinks, function () { + var trHtml = ""; + trHtml += ''; + trHtml += ' ' + this.kolProjectLink_text + ''; + + trHtml += ''; + + $('#previewLink_table tbody').append(trHtml); + }); + + $.each(obj.kolProjectImages, function () { + var ret = ''; + ret += '
'; + ret += ' '; + ret += '
'; + + var trHtml = ""; + trHtml += ''; + trHtml += ' ' + ret + ' '; + + trHtml += ' ' + this.kolProjectImage_desc + ' '; + + trHtml += ''; + + $('#previewCut_table tbody').append(trHtml); + }); + + + $('#previewkolProject_memo').val(obj.kolProject.kolProject_memo); + + + + + + $('#clientCasePreviewModal').modal('toggle'); + } else { + alert(data.message); + + if (data.err_code == "9999") { + location.href = "/Home/Index"; + } + } + }, + error: function (jqXHR, textStatus, errorThrown) { + alert('網路或伺服器發生錯誤，請稍後重試!'); + } + }); + } + if (type == "edit") { $('#kolProject_method').val('edit'); $('#kolProject_uid').val(uid);