pivot

modules/pivot/src/main/java/ru/systematic/cisstat/portlet/PivotPortlet.java

@@ -16,6 +16,8 @@ import org.osgi.service.component.annotations.Component;
 	property = {
 		"com.liferay.portlet.display-category=category.sample",
 		"com.liferay.portlet.instanceable=true",
+		"com.liferay.portlet.header-portlet-css=/dist/pivot.css",
+		"com.liferay.portlet.header-portlet-javascript=/dist/pivot.js",
 		"javax.portlet.display-name=pivot Portlet",
 		"javax.portlet.init-param.template-path=/",
 		"javax.portlet.init-param.view-template=/view.jsp",

modules/pivot/src/main/resources/META-INF/resources/dist/pivot.jp.js

-(function() {
-  var callWithJQuery;
-
-  callWithJQuery = function(pivotModule) {
-    if (typeof exports === "object" && typeof module === "object") {
-      return pivotModule(require("jquery"));
-    } else if (typeof define === "function" && define.amd) {
-      return define(["jquery"], pivotModule);
-    } else {
-      return pivotModule(jQuery);
-    }
-  };
-
-  callWithJQuery(function($) {
-    var jaFmtInt, jaFmtPct, jpFmt, nf, tpl;
-    nf = $.pivotUtilities.numberFormat;
-    tpl = $.pivotUtilities.aggregatorTemplates;
-    jpFmt = nf({
-      thousandsSep: ",",
-      decimalSep: "."
-    });
-    jaFmtInt = nf({
-      digitsAfterDecimal: 0,
-      thousandsSep: ",",
-      decimalSep: "."
-    });
-    jaFmtPct = nf({
-      digitsAfterDecimal: 1,
-      scaler: 100,
-      suffix: "%",
-      thousandsSep: ",",
-      decimalSep: "."
-    });
-    return $.pivotUtilities.locales.ja = {
-      localeStrings: {
-        renderError: "描画処理でエラーが発生しました。",
-        computeError: "処理中にエラーが発生しました。",
-        uiRenderError: "表示処理中にエラーが発生しました。",
-        selectAll: "全選択",
-        selectNone: "選択解除",
-        tooMany: "項目が多すぎます",
-        filterResults: "項目を検索する",
-        totals: "合計",
-        vs: "vs",
-        by: "per",
-        apply: "適用する",
-        cancel: "キャンセル"
-      },
-      aggregators: {
-        "件数": tpl.count(jpFmtInt),
-        "件数（ユニーク）": tpl.countUnique(jpFmtInt),
-        "ユニーク値を表示 (CSV)": tpl.listUnique(", "),
-        "合計": tpl.sum(jpFmt),
-        "合計（整数）": tpl.sum(jpFmtInt),
-        "平均": tpl.average(jpFmt),
-        "最小": tpl.min(jpFmt),
-        "最大": tpl.max(jpFmt),
-        "選択２項目の比率": tpl.sumOverSum(jpFmt),
-        "選択２項目の比率（上限80%）": tpl.sumOverSumBound80(true, jpFmt),
-        "選択２項目の比率（下限80%）": tpl.sumOverSumBound80(false, jpFmt),
-        "合計割合": tpl.fractionOf(tpl.sum(), "total", jpFmtPct),
-        "合計割合（行）": tpl.fractionOf(tpl.sum(), "row", jpFmtPct),
-        "合計割合（列）": tpl.fractionOf(tpl.sum(), "col", jpFmtPct),
-        "件数割合": tpl.fractionOf(tpl.count(), "total", jpFmtPct),
-        "件数割合（行）": tpl.fractionOf(tpl.count(), "row", jpFmtPct),
-        "件数割合（列）": tpl.fractionOf(tpl.count(), "col", jpFmtPct)
-      },
-      renderers: {
-        "表": $.pivotUtilities.renderers["Table"],
-        "表（棒グラフ）": $.pivotUtilities.renderers["Table Barchart"],
-        "ヒートマップ": $.pivotUtilities.renderers["Heatmap"],
-        "ヒートマップ（行）": $.pivotUtilities.renderers["Row Heatmap"],
-        "ヒートマップ（列）": $.pivotUtilities.renderers["Col Heatmap"]
-      }
-    };
-  });
-
-}).call(this);
-
-//# sourceMappingURL=pivot.jp.js.map

modules/pivot/src/main/resources/META-INF/resources/dist/pivot.jp.min.js

-(function(){var t;(t=function(t){return"object"==typeof exports&&"object"==typeof module?t(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],t):t(jQuery)})(function(t){var e,r,i,o,n;return o=t.pivotUtilities.numberFormat,n=t.pivotUtilities.aggregatorTemplates,i=o({thousandsSep:",",decimalSep:"."}),e=o({digitsAfterDecimal:0,thousandsSep:",",decimalSep:"."}),r=o({digitsAfterDecimal:1,scaler:100,suffix:"%",thousandsSep:",",decimalSep:"."}),t.pivotUtilities.locales.ja={localeStrings:{renderError:"描画処理でエラーが発生しました。",computeError:"処理中にエラーが発生しました。",uiRenderError:"表示処理中にエラーが発生しました。",selectAll:"全選択",selectNone:"選択解除",tooMany:"項目が多すぎます",filterResults:"項目を検索する",totals:"合計",vs:"vs",by:"per",apply:"適用する",cancel:"キャンセル"},aggregators:{"件数":n.count(jpFmtInt),"件数（ユニーク）":n.countUnique(jpFmtInt),"ユニーク値を表示 (CSV)":n.listUnique(", "),"合計":n.sum(i),"合計（整数）":n.sum(jpFmtInt),"平均":n.average(i),"最小":n.min(i),"最大":n.max(i),"選択２項目の比率":n.sumOverSum(i),"選択２項目の比率（上限80%）":n.sumOverSumBound80(!0,i),"選択２項目の比率（下限80%）":n.sumOverSumBound80(!1,i),"合計割合":n.fractionOf(n.sum(),"total",jpFmtPct),"合計割合（行）":n.fractionOf(n.sum(),"row",jpFmtPct),"合計割合（列）":n.fractionOf(n.sum(),"col",jpFmtPct),"件数割合":n.fractionOf(n.count(),"total",jpFmtPct),"件数割合（行）":n.fractionOf(n.count(),"row",jpFmtPct),"件数割合（列）":n.fractionOf(n.count(),"col",jpFmtPct)},renderers:{"表":t.pivotUtilities.renderers.Table,"表（棒グラフ）":t.pivotUtilities.renderers["Table Barchart"],"ヒートマップ":t.pivotUtilities.renderers.Heatmap,"ヒートマップ（行）":t.pivotUtilities.renderers["Row Heatmap"],"ヒートマップ（列）":t.pivotUtilities.renderers["Col Heatmap"]}}})}).call(this);
-//# sourceMappingURL=pivot.jp.min.js.map

modules/pivot/src/main/resources/META-INF/resources/view.jsp

 <%@ include file="/init.jsp" %>
 
-<!doctype html>
-<html>
-<body>
 <div id="output"></div>
-<!-- <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"></script> -->
-<script src="dist/pivot.js"></script>
-<link rel="stylesheet" type="text/css" href="dist/pivot.css">
+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"></script>
+<!-- <script src="dist/pivot.js"></script>
+<link rel="stylesheet" type="text/css" href="dist/pivot.css"> -->
 <script>
     $(function(){
         $("#output").pivotUI(
@@ -24,5 +21,4 @@
         );
      });
 </script>
-</body>
-</html>
+123
\ No newline at end of file
\ No newline at end of file