cronapp-framework-js 2.9.6-SP.40 → 2.9.6-SP.41

package/js/directives.js

@@ -2989,7 +2989,11 @@
               var cronappDatasource = this.dataSource.transport.options.cronappDatasource;
               if (!(cronappDatasource.inserting || cronappDatasource.editing)) {
                 if (this.selectable) {
+                  setToActiveInCronappDataSource.bind(this)(e.data);
                   this.select(e.masterRow);
+                  if (options.columns.find(c => c.dataType == 'Selectable') !== undefined) {
+                    collapseAllExcecptCurrent(this, e.detailRow, e.masterRow);
+                  }
                 }
                 else {
                   setToActiveInCronappDataSource.bind(this)(e.data);
@@ -3217,14 +3221,19 @@
               },
               change: function(e) {
                 var item = this.dataItem(this.select());
-                setToActiveInCronappDataSource.bind(this)(item);
                 var cronappDatasource = this.dataSource.transport.options.cronappDatasource;
                 if(options.fieldType && options.fieldType === 'key'){
                   cronappDatasource.active = helperDirective.changeObjectField(cronappDatasource, cronappDatasource.active);
                 }
+
+                let trDetails = this.select().next();
+                let trMasters = this.select();
+
                 if (ngModelCtrl) {
                   if ("multiple" === options.allowSelectionRowType) {
                     let selecteds = [];
+                    trDetails = [];
+                    trMasters = [];
                     this.select().each((i, row)=> {
                       let item = this.dataItem(row);
                       let objInDs = cronappDatasource.findObjInDs(item, false);
@@ -3234,6 +3243,10 @@
                       if (objInDs !== null){
                         selecteds.push(objInDs);
                       }
+                      if (item["_objectKey"] === cronappDatasource.active["_objectKey"]) {
+                        trMasters.push(this.select()[i]);
+                        trDetails.push(this.select().next()[i]);
+                      }
                     });
                     ngModelCtrl.$setViewValue(selecteds);
                   }
@@ -3246,7 +3259,7 @@
                     }
                   }
                 }
-                collapseAllExcecptCurrent(this, this.select().next(), this.select());
+                collapseAllExcecptCurrent(this, trDetails, trMasters);
 
                 if (attrs && attrs.ngChange) {
                   scope.$eval(attrs.ngChange);
@@ -3269,8 +3282,8 @@
                       command = 'edit';
                     }
 
-                      let modelName = helperDirective.getModelName(attrs);
-                      if (item && item["_objectKey"]) {
+                    let modelName = helperDirective.getModelName(attrs);
+                    if (item && item["_objectKey"]) {
                       let key = item["_objectKey"];
                       let id = `${modelName}-${command}-${key}`;
                       $elem.attr('id', id);

package/js/reports/reports.service.js

@@ -14,7 +14,7 @@
     // data
     this.getReport = function(reportName) {
       var req = {
-        url : 'api/rest/report',
+        url : window.hostApp + 'api/rest/report',
         method : 'POST',
         data : angular.toJson({
           'reportName' : reportName
@@ -26,7 +26,7 @@
     // bytes[]
     this.getPDF = function(report) {
       var req = {
-        url : 'api/rest/report/pdf',
+        url : window.hostApp + 'api/rest/report/pdf',
         method : 'POST',
         responseType : 'arraybuffer',
         data : angular.toJson(report)
@@ -37,7 +37,7 @@
     // file
     this.getPDFAsFile = function(report) {
       var req = {
-        url : 'api/rest/report/pdfasfile',
+        url : window.hostApp + 'api/rest/report/pdfasfile',
         method : 'POST',
         data : angular.toJson(report)
       };
@@ -46,7 +46,7 @@
 
     this.getContentAsString = function(report) {
       var req = {
-        url : 'api/rest/report/contentasstring',
+        url : window.hostApp + 'api/rest/report/contentasstring',
         method : 'POST',
         data : angular.toJson(report)
       };
@@ -55,7 +55,7 @@
 
     this.getDataSourcesParams = function(datasourcesInBand) {
       var req = {
-        url : 'api/rest/report/getdatasourcesparams',
+        url : window.hostApp + 'api/rest/report/getdatasourcesparams',
         method : 'POST',
         data : angular.toJson(datasourcesInBand)
       };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cronapp-framework-js",
-  "version": "2.9.6-SP.40",
+  "version": "2.9.6-SP.41",
   "description": "Javascript library for CronApp's projects",
   "main": "cronapp.framework.js",
   "scripts": {