Yang UI - new features and fixes

[dlux.git] / modules / yangui-resources / src / main / resources / yangui / views / parts / collection-tab.tpl.html

diff --git a/modules/yangui-resources/src/main/resources/yangui/views/parts/collection-tab.tpl.html b/modules/yangui-resources/src/main/resources/yangui/views/parts/collection-tab.tpl.html
index 8e7dc7f7cdb7915694bad15e787960d073b26e06..f4da40d0f35dd1b12b5bef8af765c5f651acf090 100644 (file)
--- a/modules/yangui-resources/src/main/resources/yangui/views/parts/collection-tab.tpl.html
+++ b/modules/yangui-resources/src/main/resources/yangui/views/parts/collection-tab.tpl.html
@@ -12,8 +12,8 @@
         </div>\r
 \r
         <div class="scroll">\r
-            <div ng-repeat="req in collectionList.ungrouped track by $index"  class="trdiv" ng-class="$index === 0 ? 'no-border' : ''">\r
-                <div>\r
+            <div ng-repeat="req in collectionList.ungrouped" class="trdiv">\r
+                <div ng-controller="reqInHistoryCtrl" ng-init="init(collectionList)">\r
                     <div class="tddiv rh-col1"><button class="yangButton iconDanger" tooltip="{{ 'YANGUI_API_NOT_AVAILABLE' | translate }}" ng-hide="req.availability"></button></div>\r
                     <div class="tddiv rh-col2"><span>{{ req.method }}</span></div>\r
                     <div class="tddiv rh-col8"><span>{{ req.name }}</span></div>\r
@@ -21,14 +21,14 @@
                     <div class="tddiv rh-col4"><span>{{ req.status }}</span></div>\r
                     <div class="tddiv rh-col5">\r
                         <div tooltip="{{ req.sentData ? '' : 'YANGUI_HISTORY_NO_SEND_DATA_TT' | translate }}">\r
-                            <button class="btn btn-primary ng-scope btn-slim {{!req.sentData ? 'disabled' : ''}}" ng-click='show_history_data(req, true, req.sentData ? false : true)'>\r
+                            <button class="btn btn-primary ng-scope btn-slim {{!req.sentData ? 'disabled' : ''}}" ng-click='showShistoryData()'>\r
                                 {{ 'YANGUI_HISTORY_SEND_DATA' | translate }}\r
                             </button>\r
                         </div>\r
                     </div>\r
                     <div class="tddiv rh-col6">\r
                         <div tooltip="{{ req.receivedData ? '' : 'YANGUI_HISTORY_NO_REC_DATA_TT' | translate }}">\r
-                            <button class="btn btn-primary ng-scope btn-slim {{!req.receivedData ? 'disabled' : ''}}" ng-click='show_history_data(req, false, req.receivedData ? false : true)'>\r
+                            <button class="btn btn-primary ng-scope btn-slim {{!req.receivedData ? 'disabled' : ''}}" ng-click='showRhistoryData()'>\r
                                 {{ 'YANGUI_HISTORY_REC_DATA' | translate }}\r
                             </button>\r
                         </div>\r
@@ -37,12 +37,12 @@
                         <div class="requestActions">\r
 \r
                             <div class="inlineBlock" tooltip="{{ req.availability ? 'YANGUI_RUN' : 'YANGUI_API_NA_ERROR_TT' | translate }}">\r
-                                <button ng-disabled="!req.availability" class="yangButton iconNext {{ req.availability ? '' : 'disabled' }}" ng-click='executeCollectionRequest(req)'>\r
+                                <button ng-disabled="!req.availability" class="yangButton iconNext {{ req.availability ? '' : 'disabled' }}" ng-click='executeCollectionRequest(req, dataForView, showData)'>\r
                                 </button>\r
                             </div>\r
-                            \r
+\r
                             <div class="inlineBlock" tooltip="{{ req.availability ? (req.receivedData || req.sentData) ? 'YANGUI_FILL_DATA_TT' : 'YANGUI_REC_SENT_DATA_ERROR_TT' : 'YANGUI_API_NA_ERROR_TT' | translate }}">\r
-                            <button class="yangButton iconFillData {{ req.availability && (req.receivedData || req.sentData) ? '' : 'disabled' }}" ng-click='fillApiAndData(req)'>\r
+                                <button class="yangButton iconFillData {{ req.availability && (req.receivedData || req.sentData) ? '' : 'disabled' }}" ng-click='fillApiAndData(req, dataForView)'>\r
                                 </button>\r
                             </div>\r
 \r
@@ -52,29 +52,14 @@
                             <button class="yangButton iconClose" ng-click="deleteRequestItem(req, 'collectionList')" tooltip="{{ 'YANGUI_DELETE' | translate }}"></button>\r
                         </div>\r
                     </div>\r
+\r
+                    <div ng-show="showData" class="trdiv pre-div" ng-include src="currentPath + 'parts/history-dataview-part.tpl.html'"></div>\r
                 </div>\r
-            \r
-                <div ng-show="req.show" class="trdiv pre-div">\r
-                    <!-- <button class="yangButton icon-remove close" ng-class="req.sentData && req.api ? 'white-cross' : ''" ng-click="close_popup(req)"></button> -->\r
-\r
-                    <div class="api" ng-show="req.sentData && req.api">\r
-                        <span><strong>{{'YANGUI_API_PATH' | translate}}:</strong>\r
-                        <span ng-repeat="pathElem in req.api.clonedPathArray">{{pathElem.moduleChanged ? '/'+pathElem.module+':': '/'}}{{pathElem.name}}\r
-                            <span ng-show="pathElem.hasIdentifier()">\r
-                                <span ng-repeat="identifier in pathElem.identifiers">\r
-                                  /<input  type="text" class="form-control input-small" ng-model="identifier.value" ng-change="fillRequestData(req, pathElem, identifier)">\r
-                                </span>\r
-                            </span>\r
-                        </span>\r
-\r
-                        <button class="btn btn-primary btn-slim ml20" ng-click="req.clearParametrizedData()">{{'YANGUI_CLEAR_PAR_DATA_BTN' | translate}}</button>\r
-                        <button class="btn btn-primary btn-slim" ng-click="saveParametrizedData(req, collectionList)">{{'YANGUI_SAVE_PAR_DATA_BTN' | translate}}</button>\r
-                    </div>\r
-                    <div class="textareaWrapper">\r
-                        <textarea ng-disabled="!req.sentDataView" ng-model="req.data">{{ req.data }}</textarea>\r
-                        <button class="yangButton icon-remove close closeData ng-scope" ng-click="close_history_data(req)" tooltip="Close"></button>\r
-                    </div>\r
-                </div>\r
+\r
+\r
+\r
+\r
+\r
             </div>\r
 \r
             <div ng-repeat="(key, value) in collectionList.groups" class="groupWrapper" ng-init="setGroupView(key)">\r
@@ -82,8 +67,8 @@
                     {{key}} <i class="{{groupView[key] ? 'icon-caret-down':'icon-caret-right'}}"></i>\r
                 </section>\r
 \r
-                <section ng-repeat="req in value track by $index" ng-show="groupView[key]" class="trdiv groupList" ng-class="$index === 0 ? 'no-border' : ''">\r
-                    <div>\r
+                <section ng-repeat="req in value" ng-show="groupView[key]" class="trdiv groupList">\r
+                    <div ng-controller="reqInHistoryCtrl" ng-init="init(collectionList)">\r
                         <div class="tddiv rh-col1"><button class="yangButton iconDanger" tooltip="{{ 'YANGUI_API_NOT_AVAILABLE' | translate }}" ng-hide="req.availability"></button></div>\r
                         <div class="tddiv rh-col2"><span>{{ req.method }}</span></div>\r
                         <div class="tddiv rh-col8"><span>{{ req.name }}</span></div>\r
@@ -91,14 +76,14 @@
                         <div class="tddiv rh-col4"><span>{{ req.status }}</span></div>\r
                         <div class="tddiv rh-col5">\r
                             <div tooltip="{{ req.sentData ? '' : 'YANGUI_HISTORY_NO_SEND_DATA_TT' | translate }}">\r
-                                <button class="btn btn-primary ng-scope btn-slim {{!req.sentData ? 'disabled' : ''}}" ng-click='show_history_data(req, true, req.sentData ? false : true)'>\r
+                                <button class="btn btn-primary ng-scope btn-slim {{!req.sentData ? 'disabled' : ''}}" ng-click='showShistoryData()'>\r
                                     {{ 'YANGUI_HISTORY_SEND_DATA' | translate }}\r
                                 </button>\r
                             </div>\r
                         </div>\r
                         <div class="tddiv rh-col6">\r
                             <div tooltip="{{ req.receivedData ? '' : 'YANGUI_HISTORY_NO_REC_DATA_TT' | translate }}">\r
-                                <button class="btn btn-primary ng-scope btn-slim {{!req.receivedData ? 'disabled' : ''}}" ng-click='show_history_data(req, false, req.receivedData ? false : true)'>\r
+                                <button class="btn btn-primary ng-scope btn-slim {{!req.receivedData ? 'disabled' : ''}}" ng-click='showRhistoryData()'>\r
                                     {{ 'YANGUI_HISTORY_REC_DATA' | translate }}\r
                                 </button>\r
                             </div>\r
@@ -107,12 +92,12 @@
                             <div class="requestActions">\r
                                 <div class="inlineBlock" tooltip="{{ req.availability ? (req.receivedData || req.sentData) ? 'YANGUI_FILL_DATA_TT' : 'YANGUI_REC_SENT_DATA_ERROR_TT' : 'YANGUI_API_NA_ERROR_TT' | translate }}">\r
 \r
-                                <div class="inlineBlock" tooltip="{{ req.availability ? 'YANGUI_RUN' : 'YANGUI_API_NA_ERROR_TT' | translate }}">\r
-                                    <button ng-disabled="!req.availability" class="yangButton iconNext {{ req.availability ? '' : 'disabled' }}" ng-click='executeCollectionRequest(req)'>\r
-                                    </button>\r
-                                </div>\r
+                                    <div class="inlineBlock" tooltip="{{ req.availability ? 'YANGUI_RUN' : 'YANGUI_API_NA_ERROR_TT' | translate }}">\r
+                                        <button ng-disabled="!req.availability" class="yangButton iconNext {{ req.availability ? '' : 'disabled' }}" ng-click='executeCollectionRequest(req, dataForView, showData)'>\r
+                                        </button>\r
+                                    </div>\r
 \r
-                                <button class="yangButton iconFillData {{ req.availability && (req.receivedData || req.sentData) ? '' : 'disabled' }}" ng-click='fillApiAndData(req)'>\r
+                                    <button class="yangButton iconFillData {{ req.availability && (req.receivedData || req.sentData) ? '' : 'disabled' }}" ng-click='fillApiAndData(req, dataForView)'>\r
                                     </button>\r
                                 </div>\r
 \r
@@ -123,29 +108,11 @@
                                 <button class="yangButton iconClose" ng-click="deleteRequestItem(req, 'collectionList')" tooltip="{{ 'YANGUI_DELETE' | translate }}"></button>\r
                             </div>\r
                         </div>\r
+\r
+                        <div ng-show="showData" class="trdiv pre-div" ng-include src="currentPath + 'parts/history-dataview-part.tpl.html'"></div>\r
                     </div>\r
-                \r
-                    <div ng-show="req.show" class="trdiv pre-div">\r
-                        <!-- <button class="yangButton icon-remove close" ng-class="req.sentData && req.api ? 'white-cross' : ''" ng-click="close_popup(req)"></button> -->\r
-\r
-                        <div class="api" ng-show="req.sentData && req.api">\r
-                            <span><strong>{{'YANGUI_API_PATH' | translate}}:</strong>\r
-                            <span ng-repeat="pathElem in req.api.clonedPathArray">{{pathElem.moduleChanged ? '/'+pathElem.module+':': '/'}}{{pathElem.name}}\r
-                                <span ng-show="pathElem.hasIdentifier()">\r
-                                    <span ng-repeat="identifier in pathElem.identifiers">\r
-                                      /<input  type="text" class="form-control input-small" ng-model="identifier.value" ng-change="fillRequestData(req, pathElem, identifier)">\r
-                                    </span>\r
-                                </span>\r
-                            </span>\r
-\r
-                            <button class="btn btn-primary btn-slim ml20" ng-click="req.clearParametrizedData()">{{'YANGUI_CLEAR_PAR_DATA_BTN' | translate}}</button>\r
-                            <button class="btn btn-primary btn-slim" ng-click="saveParametrizedData(req, collectionList)">{{'YANGUI_SAVE_PAR_DATA_BTN' | translate}}</button>\r
-                        </div>\r
-                        <div class="textareaWrapper">\r
-                            <textarea ng-disabled="!req.sentDataView" ng-model="req.data">{{ req.data }}</textarea>\r
-                            <button class="yangButton icon-remove close closeData ng-scope" ng-click="close_history_data(req)" tooltip="Close"></button>\r
-                        </div>\r
-                    </div>\r
+\r
+\r
                 </section>\r
 \r
             </div>\r