Index: arms/html/analysisResource/content-container.html =================================================================== diff -u -r76bdf2a3d21da046a0045f84be1194f7fb4d34f5 -rbbb43479683b803df89527a569a9cb542613a423 --- arms/html/analysisResource/content-container.html (.../content-container.html) (revision 76bdf2a3d21da046a0045f84be1194f7fb4d34f5) +++ arms/html/analysisResource/content-container.html (.../content-container.html) (revision bbb43479683b803df89527a569a9cb542613a423) @@ -563,7 +563,7 @@
-
+

@@ -1677,8 +1675,4 @@
- - - \ No newline at end of file + \ No newline at end of file FishEye: Tag bbb43479683b803df89527a569a9cb542613a423 refers to a dead (removed) revision in file `arms/html/analysisResource/modal/content-modal.html'. FishEye: No comparison available. Pass `N' to diff? Index: arms/html/analysisResource/modal/content-modal_sankey.html =================================================================== diff -u --- arms/html/analysisResource/modal/content-modal_sankey.html (revision 0) +++ arms/html/analysisResource/modal/content-modal_sankey.html (revision bbb43479683b803df89527a569a9cb542613a423) @@ -0,0 +1,158 @@ +
+
+

+ + + 제품 및 버전별 작업자 + +
+
+

+ 제품 및 버전에 투입된 작업자 현황입니다. +

+
+ +
+
+

+
+ + + +
+
+
+ +
+
+
+ +
+
+
+
+
+ Sankey Chart +
+ +
+
+
+
+
+ List Data (Excel) +
+ +
+
+
+
+
+ +
+
+ +
+
+ + + \ No newline at end of file Index: reference/jquery-plugins/select2-4.0.13/src/scss/theme/default/layout.scss =================================================================== diff -u -rd8a05f01cf854c4284f6c2aeacd83931b0f64ec8 -rbbb43479683b803df89527a569a9cb542613a423 --- reference/jquery-plugins/select2-4.0.13/src/scss/theme/default/layout.scss (.../layout.scss) (revision d8a05f01cf854c4284f6c2aeacd83931b0f64ec8) +++ reference/jquery-plugins/select2-4.0.13/src/scss/theme/default/layout.scss (.../layout.scss) (revision bbb43479683b803df89527a569a9cb542613a423) @@ -110,109 +110,42 @@ } function widgsterWrapper() { - var height; $.fn.widgster.Constructor.prototype.fullscreen = function () { - var e = $.Event("fullscreen.widgster"); + var self = this.$element; + var $widget = $("#widget-fullscreen"); + var url = self.data("layout"); - this.$element.trigger(e); + if(url) { + $widget.load(url, function() { + $widget.show(); + $widget.find("[data-widgster='restore']").show(); + $("body").css("overflow", "hidden"); - if (e.isDefaultPrevented()) return; + self.trigger($.Event("fullscreened.widgster")); + widgsterDocReady(); + }); + } else { + console.log("[common :: widgsterWrapper] :: fullscreen layout 이 없습니다."); + } - this.$element.css({ - position: "fixed", - top: 0, - right: 0, - bottom: 0, - left: 0, - margin: 0, - "z-index": 10000, - "box-sizing": "border-box", - height: "100vh", - overflow: "auto" - }); - - var body = this.$element.find(".body"); - var siblingsHeight = body - .siblings() - .toArray() - .reduce(function (acc, cur) { - return (acc += cur.clientHeight); - }, 0); - var margin = - parseInt(body.css("margin-top")) + - parseInt(body.css("margin-bottom")) + - parseInt(this.$element.css("padding-top")) + - parseInt(this.$element.css("padding-bottom")) + - parseInt(this.$element.css("margin-top")) + - parseInt(this.$element.css("margin-bottom")); - - // height = body.css("height"); - body.css("height", "calc(100% - " + (siblingsHeight + margin) + "px)"); - - $("body").css("overflow", "hidden"); - - this.wasCollapsed = this.collapsed; - this.expand(false); - - this.$fullscreen.hide(); - this.$restore.show(); - - this.$collapse.hide(); - this.$expand.hide(); - - this.$element.addClass("fullscreened"); - - this.$element.addClass("modalDarkBack"); - - this.$element.trigger($.Event("fullscreened.widgster")); - return false; }; $.fn.widgster.Constructor.prototype.restore = function () { - var e = $.Event("restore.widgster"); + var $widget = $("#widget-fullscreen"); - this.$element.trigger(e); + $widget.empty(); + $widget.hide(); + $widget.find("[data-widgster='restore']").hide(); - if (e.isDefaultPrevented()) return; - - this.$element.css({ - position: "", - top: "", - right: "", - bottom: "", - left: "", - margin: "", - "z-index": "", - "box-sizing": "", - height: "", - overflow: "" - }); - - this.$element.find(".body").css("height", ""); $("body").css("overflow", ""); - this.$fullscreen.show(); - this.$restore.hide(); - - if (this.collapsed) { - this.$collapse.hide(); - this.$expand.show(); - } else { - this.$collapse.show(); - this.$expand.hide(); - } - - this.wasCollapsed && this.collapse(false); - - this.$element.removeClass("fullscreened"); - this.$element.removeClass("modalDarkBack"); - this.$element.trigger($.Event("restored.widgster")); return false; }; + } function 로드_완료_이후_실행_함수() { Index: arms/js/modal/fs_analysisResource.js =================================================================== diff -u --- arms/js/modal/fs_analysisResource.js (revision 0) +++ arms/js/modal/fs_analysisResource.js (revision bbb43479683b803df89527a569a9cb542613a423) @@ -0,0 +1,36 @@ +(function(){ + $('a[data-toggle="tab"]').on("shown.bs.tab", function (e) { + var target = $(e.target).attr("href"); // activated tab + + if(target === "#chart_data") { + let tarId = "modal_chart"; + if (selectedVersionId) { + drawProductToManSankeyChart(selectedPdServiceId, selectedVersionId, tarId, 10000); + } else { + jError("서비스 및 버전을 설정 후 선택해주세요."); + } + } else if (target === "#excel_data") { + console.log("excel_data"); + // $("#btn_modal_excel").click(); + let tarId = "modal_excel"; + JspreadsheetApi.getSheetData(); + JspreadsheetApi.sheetRender(tarId); + + } else if (target === "#option_toggle") { + $(".option_tab").removeClass("active"); + e.preventDefault(); + if ($(".fullscreen-body-main").hasClass("col-lg-12")) { + $(".fullscreen-body-main").removeClass("col-lg-12").addClass("col-lg-9"); + $(".fullscreen-body-option").removeClass("hidden"); + } else { + $(".fullscreen-body-main").removeClass("col-lg-9").addClass("col-lg-12"); + $(".fullscreen-body-option").addClass("hidden"); + } + + } + }); + + $("#fullscreen_modal_close").on("click", function() { + $(".fullscreen-header>.widget-controls>a[data-widgster='restore']").click(); + }); +})(); // 이벤트 리스너 등록 및 즉시실행. \ No newline at end of file Index: arms/template.html =================================================================== diff -u -rbeaedce8d80f5c20c28c07518066a54ccdfabeb4 -rbbb43479683b803df89527a569a9cb542613a423 --- arms/template.html (.../template.html) (revision beaedce8d80f5c20c28c07518066a54ccdfabeb4) +++ arms/template.html (.../template.html) (revision bbb43479683b803df89527a569a9cb542613a423) @@ -320,6 +320,25 @@ +
+
+