Fixed issue: ordering of questions erroring

assets/packages/adminpanel/build/lsadminpanel.debug.js

@@ -11245,7 +11245,7 @@ var content=__webpack_require__(343);if(typeof content==='string')content=[[modu
 var update=__webpack_require__(45)("3c0fbac0",content,true);/***/},/* 343 *//***/function(module,exports,__webpack_require__){exports=module.exports=__webpack_require__(44)(undefined);// imports
 // module
 exports.push([module.i,".display-as-container{display:block}#questionexplorer{overflow:auto}",""]);// exports
-/***/},/* 344 *//***/function(module,__webpack_exports__,__webpack_require__){"use strict";Object.defineProperty(__webpack_exports__,"__esModule",{value:true});/* harmony import */var __WEBPACK_IMPORTED_MODULE_0_lodash__=__webpack_require__(46);/* harmony import */var __WEBPACK_IMPORTED_MODULE_0_lodash___default=__webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_lodash__);/* harmony import */var __WEBPACK_IMPORTED_MODULE_1__mixins_runAjax_js__=__webpack_require__(47);/* harmony default export */__webpack_exports__["default"]={mixins:[__WEBPACK_IMPORTED_MODULE_1__mixins_runAjax_js__["a"/* default */]],props:{createQuestionGroupLink:{type:String},createQuestionLink:{type:String},translate:{type:Object}},data:function data(){return{active:[],questiongroupDragging:false,draggedQuestionGroup:null,questionDragging:false,draggedQuestion:null,draggedQuestionsGroup:null};},computed:{calculatedHeight:function calculatedHeight(){var containerHeight=this.$store.state.maxHeight;return containerHeight-100;},orderedQuestionGroups:function orderedQuestionGroups(){return __WEBPACK_IMPORTED_MODULE_0_lodash___default.a.orderBy(this.$store.state.questiongroups,function(a){return parseInt(a.group_order);},["asc"]);},createQuestionAllowed:function createQuestionAllowed(){return this.$store.state.questiongroups.length>0&&this.createQuestionLink!=undefined&&this.createQuestionLink.length>1;},createAllowance:function createAllowance(){var createGroupAllowed=this.createQuestionGroupLink!=undefined&&this.createQuestionGroupLink.length>1?"g":"";var createQuestionAllowed=this.createQuestionAllowed?"q":"";return createGroupAllowed+createQuestionAllowed;},itemWidth:function itemWidth(){return parseInt(this.$store.state.sidebarwidth)-95+"px";}},methods:{questionItemClasses:function questionItemClasses(question){var classes="";classes+=this.$store.state.lastQuestionOpen===question.qid?"selected":" ";if(this.draggedQuestion!==null)classes+=this.draggedQuestion.qid===question.qid?" dragged":" ";return classes;},questionGroupItemClasses:function questionGroupItemClasses(questionGroup){var classes="";classes+=this.isActive(questionGroup.gid)?"selected":" ";if(this.draggedQuestionGroup!==null)classes+=this.draggedQuestionGroup.gid===questionGroup.gid?" dragged":" ";return classes;},orderQuestions:function orderQuestions(questionList){return __WEBPACK_IMPORTED_MODULE_0_lodash___default.a.orderBy(questionList,function(a){return parseInt(a.question_order||999999);},["asc"]);},isActive:function isActive(index){var result=__WEBPACK_IMPORTED_MODULE_0_lodash___default.a.indexOf(this.active,index)!=-1;if(this.questiongroupDragging===true)return false;return result;},toggleActivation:function toggleActivation(index){if(this.isActive(index)){var removed=__WEBPACK_IMPORTED_MODULE_0_lodash___default.a.remove(this.active,function(idx){return idx===index;});}else{this.active.push(index);}this.$forceUpdate();this.$store.commit("questionGroupOpenArray",this.active);this.updatePjaxLinks();},addActive:function addActive(questionGroupId){if(!this.isActive(questionGroupId)){this.active.push(questionGroupId);}this.$store.commit("questionGroupOpenArray",this.active);},openQuestionGroup:function openQuestionGroup(questionGroup){this.addActive(questionGroup.gid);this.$store.commit("lastQuestionGroupOpen",questionGroup);this.$forceUpdate();this.updatePjaxLinks();},openQuestion:function openQuestion(question){this.addActive(question.gid);this.$store.commit("lastQuestionOpen",question);this.$forceUpdate();$(document).trigger("pjax:load",{url:question.link});},//dragevents questiongroups
+/***/},/* 344 *//***/function(module,__webpack_exports__,__webpack_require__){"use strict";Object.defineProperty(__webpack_exports__,"__esModule",{value:true});/* harmony import */var __WEBPACK_IMPORTED_MODULE_0_lodash__=__webpack_require__(46);/* harmony import */var __WEBPACK_IMPORTED_MODULE_0_lodash___default=__webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_lodash__);/* harmony import */var __WEBPACK_IMPORTED_MODULE_1__mixins_runAjax_js__=__webpack_require__(47);/* harmony default export */__webpack_exports__["default"]={mixins:[__WEBPACK_IMPORTED_MODULE_1__mixins_runAjax_js__["a"/* default */]],props:{createQuestionGroupLink:{type:String},createQuestionLink:{type:String},translate:{type:Object}},data:function data(){return{active:[],questiongroupDragging:false,draggedQuestionGroup:null,questionDragging:false,draggedQuestion:null,draggedQuestionsGroup:null};},computed:{calculatedHeight:function calculatedHeight(){var containerHeight=this.$store.state.maxHeight;return containerHeight-100;},orderedQuestionGroups:function orderedQuestionGroups(){return __WEBPACK_IMPORTED_MODULE_0_lodash___default.a.orderBy(this.$store.state.questiongroups,function(a){return parseInt(a.group_order||999999);},["asc"]);},createQuestionAllowed:function createQuestionAllowed(){return this.$store.state.questiongroups.length>0&&this.createQuestionLink!=undefined&&this.createQuestionLink.length>1;},createAllowance:function createAllowance(){var createGroupAllowed=this.createQuestionGroupLink!=undefined&&this.createQuestionGroupLink.length>1?"g":"";var createQuestionAllowed=this.createQuestionAllowed?"q":"";return createGroupAllowed+createQuestionAllowed;},itemWidth:function itemWidth(){return parseInt(this.$store.state.sidebarwidth)-95+"px";}},methods:{questionItemClasses:function questionItemClasses(question){var classes="";classes+=this.$store.state.lastQuestionOpen===question.qid?"selected":" ";if(this.draggedQuestion!==null)classes+=this.draggedQuestion.qid===question.qid?" dragged":" ";return classes;},questionGroupItemClasses:function questionGroupItemClasses(questionGroup){var classes="";classes+=this.isActive(questionGroup.gid)?"selected":" ";if(this.draggedQuestionGroup!==null)classes+=this.draggedQuestionGroup.gid===questionGroup.gid?" dragged":" ";return classes;},orderQuestions:function orderQuestions(questionList){return __WEBPACK_IMPORTED_MODULE_0_lodash___default.a.orderBy(questionList,function(a){return parseInt(a.question_order||999999);},["asc"]);},isActive:function isActive(index){var result=__WEBPACK_IMPORTED_MODULE_0_lodash___default.a.indexOf(this.active,index)!=-1;if(this.questiongroupDragging===true)return false;return result;},toggleActivation:function toggleActivation(index){if(this.isActive(index)){var removed=__WEBPACK_IMPORTED_MODULE_0_lodash___default.a.remove(this.active,function(idx){return idx===index;});}else{this.active.push(index);}this.$forceUpdate();this.$store.commit("questionGroupOpenArray",this.active);this.updatePjaxLinks();},addActive:function addActive(questionGroupId){if(!this.isActive(questionGroupId)){this.active.push(questionGroupId);}this.$store.commit("questionGroupOpenArray",this.active);},openQuestionGroup:function openQuestionGroup(questionGroup){this.addActive(questionGroup.gid);this.$store.commit("lastQuestionGroupOpen",questionGroup);this.$forceUpdate();this.updatePjaxLinks();},openQuestion:function openQuestion(question){this.addActive(question.gid);this.$store.commit("lastQuestionOpen",question);this.$forceUpdate();$(document).trigger("pjax:load",{url:question.link});},//dragevents questiongroups
 startDraggingGroup:function startDraggingGroup($event,questiongroupObject){this.draggedQuestionGroup=questiongroupObject;this.questiongroupDragging=true;$event.dataTransfer.setData("text/plain","node");},endDraggingGroup:function endDraggingGroup($event,questiongroupObject){if(this.draggedQuestionGroup!==null){this.draggedQuestionGroup=null;this.questiongroupDragging=false;this.$emit("questiongrouporder");}},dragoverQuestiongroup:function dragoverQuestiongroup($event,questiongroupObject){var _this10=this;if(this.draggedQuestion==undefined||this.draggedQuestion==null){this.$log.error({this:this,event:$event,questiongroupObject:questiongroupObject,draggedQuestion:this.draggedQuestion});}if(this.questiongroupDragging){var orderSwap=questiongroupObject.group_order;questiongroupObject.group_order=this.draggedQuestionGroup.group_order;this.draggedQuestionGroup.group_order=orderSwap;}else{this.addActive(questiongroupObject.gid);if(this.draggedQuestion.gid!==questiongroupObject.gid){var removedFromInital=__WEBPACK_IMPORTED_MODULE_0_lodash___default.a.remove(this.draggedQuestionsGroup.questions,function(question,i){return question.qid===_this10.draggedQuestion.qid;});if(removedFromInital.length>0){this.draggedQuestion.question_order=null;questiongroupObject.questions.push(this.draggedQuestion);this.draggedQuestion.gid=questiongroupObject.gid;if(questiongroupObject.group_order>this.draggedQuestionsGroup.group_order){this.draggedQuestion.question_order=0;__WEBPACK_IMPORTED_MODULE_0_lodash___default.a.each(questiongroupObject.questions,function(question,i){question.question_order=parseInt(question.question_order)+1;});}else{this.draggedQuestion.question_order=this.draggedQuestionsGroup.questions.length+1;}this.draggedQuestionsGroup=questiongroupObject;}}}},//dragevents questions
 startDraggingQuestion:function startDraggingQuestion($event,questionObject,questionGroupObject){this.$log.log("Dragging started",questionObject);$event.dataTransfer.setData('application/node',this);this.questionDragging=true;this.draggedQuestion=questionObject;this.draggedQuestionsGroup=questionGroupObject;},endDraggingQuestion:function endDraggingQuestion($event,question){if(this.questionDragging){this.questionDragging=false;this.draggedQuestion=null;this.draggedQuestionsGroup=null;this.$emit("questiongrouporder");}},dragoverQuestion:function dragoverQuestion($event,questionObject,questionGroupObject){if(this.questionDragging){var orderSwap=questionObject.question_order;questionObject.question_order=this.draggedQuestion.question_order;this.draggedQuestion.question_order=orderSwap;}}},mounted:function mounted(){var _this11=this;this.active=this.$store.state.questionGroupOpenArray;this.updatePjaxLinks();$(document).on("vue-reload-remote",function(){_this11.$forceUpdate();});}};/***/},/* 345 *//***/function(module,exports){module.exports={render:function render(){var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"ls-flex-column fill ls-ba menu-pane ls-space padding all-0 margin top-5",attrs:{"id":"questionexplorer"}},[_vm.createAllowance!=''?_c('div',{staticClass:"ls-flex-row wrap align-content-space-between align-items-space-between ls-space margin top-5 bottom-15 button-sub-bar"},[_vm.createQuestionGroupLink!=undefined&&_vm.createQuestionGroupLink.length>1?_c('a',{staticClass:"btn btn-small btn-primary pjax",attrs:{"id":"adminpanel__sidebar--selectorCreateQuestionGroup","href":_vm.createQuestionGroupLink}},[_c('i',{staticClass:"fa fa-plus"}),_vm._v(" \n            "+_vm._s(_vm.translate.createQuestionGroup)+"\n        ")]):_vm._e(),_vm._v(" "),_vm.createQuestionAllowed?_c('a',{staticClass:"btn btn-small btn-default ls-space margin right-10 pjax",attrs:{"id":"adminpanel__sidebar--selectorCreateQuestion","href":_vm.createQuestionLink}},[_c('i',{staticClass:"fa fa-plus-circle"}),_vm._v(" \n            "+_vm._s(_vm.translate.createQuestion)+"\n        ")]):_vm._e()]):_vm._e(),_vm._v(" "),_c('div',{staticClass:"ls-flex-row ls-space padding all-0"},[_c('ul',{staticClass:"list-group col-12",on:{"drop":function drop($event){_vm.dropQuestionGroup($event,_vm.questiongroup);}}},_vm._l(_vm.orderedQuestionGroups,function(questiongroup){return _c('li',{key:questiongroup.gid,staticClass:"list-group-item ls-flex-column",class:_vm.questionGroupItemClasses(questiongroup),on:{"dragenter":function dragenter($event){_vm.dragoverQuestiongroup($event,questiongroup);}}},[_c('div',{staticClass:"col-12 ls-flex-row nowrap ls-space padding left-5 bottom-5"},[!_vm.$store.state.surveyActiveState?_c('i',{staticClass:"fa fa-bars bigIcons dragPointer",attrs:{"draggable":"true"},on:{"dragend":function dragend($event){_vm.endDraggingGroup($event,questiongroup);},"dragstart":function dragstart($event){_vm.startDraggingGroup($event,questiongroup);},"click":function click($event){$event.stopPropagation();$event.preventDefault();(function(){return false;})($event);}}},[_vm._v("\n                         \n                    ")]):_vm._e(),_vm._v(" "),_c('a',{staticClass:"col-12 pjax",attrs:{"href":questiongroup.link},on:{"click":function click($event){$event.stopPropagation();_vm.openQuestionGroup(questiongroup);}}},[_c('span',{staticClass:"question_text_ellipsize pull-left",style:{'max-width':_vm.itemWidth}},[_vm._v("\n                            "+_vm._s(questiongroup.group_name)+" \n                        ")]),_vm._v(" "),_c('span',{staticClass:"badge pull-right ls-space margin right-5"},[_vm._v(_vm._s(questiongroup.questions.length))])]),_vm._v(" "),_c('i',{staticClass:"fa bigIcons",class:_vm.isActive(questiongroup.gid)?'fa-caret-up':'fa-caret-down',on:{"click":function click($event){$event.preventDefault();_vm.toggleActivation(questiongroup.gid);}}},[_vm._v(" ")])]),_vm._v(" "),_c('transition',{attrs:{"name":"slide-fade-down"}},[_vm.isActive(questiongroup.gid)?_c('ul',{staticClass:"list-group background-muted padding-left question-question-list",on:{"drop":function drop($event){_vm.dropQuestion($event,_vm.question);}}},_vm._l(_vm.orderQuestions(questiongroup.questions),function(question){return _c('div',{key:question.qid,staticClass:"list-group-item question-question-list-item ls-flex-row align-itmes-flex-between",class:_vm.questionItemClasses(question),attrs:{"data-toggle":"tootltip","title":question.question_flat},on:{"dragenter":function dragenter($event){_vm.dragoverQuestion($event,question,questiongroup);}}},[!_vm.$store.state.surveyActiveState?_c('i',{staticClass:"fa fa-bars margin-right bigIcons dragPointer question-question-list-item-drag",attrs:{"draggable":"true"},on:{"dragend":function dragend($event){_vm.endDraggingQuestion($event,question);},"dragstart":function dragstart($event){_vm.startDraggingQuestion($event,question,questiongroup);},"click":function click($event){$event.stopPropagation();$event.preventDefault();(function(){return false;})($event);}}},[_vm._v("\n                                     \n                                ")]):_vm._e(),_vm._v(" "),_c('a',{staticClass:"col-12 pjax question-question-list-item-link display-as-container",attrs:{"href":question.link},on:{"click":function click($event){$event.stopPropagation();$event.preventDefault();_vm.openQuestion(question);}}},[_c('span',{staticClass:"question_text_ellipsize",style:{width:_vm.itemWidth}},[_vm._v("\n                                    ["+_vm._s(question.title)+"] › "+_vm._s(question.question_flat)+" \n                                ")])])]);})):_vm._e()])],1);}))])]);},staticRenderFns:[]/***/};},/* 346 *//***/function(module,exports,__webpack_require__){function injectStyle(ssrContext){__webpack_require__(347);}var Component=__webpack_require__(27)(/* script */__webpack_require__(349),/* template */__webpack_require__(357),/* styles */injectStyle,/* scopeId */null,/* moduleIdentifier (server only) */null);module.exports=Component.exports;/***/},/* 347 *//***/function(module,exports,__webpack_require__){// style-loader: Adds some css to the DOM by adding a <style> tag
 // load the styles

assets/packages/adminpanel/build/lsadminpanel.js

@@ -37119,7 +37119,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
         },
         orderedQuestionGroups() {
             return __WEBPACK_IMPORTED_MODULE_0_lodash___default.a.orderBy(this.$store.state.questiongroups, a => {
-                return parseInt(a.group_order);
+                return parseInt(a.group_order || 999999);
             }, ["asc"]);
         },
         createQuestionAllowed() {

assets/packages/adminpanel/src/components/subcomponents/_questionsgroups.vue

@@ -28,7 +28,7 @@ export default {
             return _.orderBy(
                 this.$store.state.questiongroups,
                 a => {
-                    return parseInt(a.group_order);
+                    return parseInt(a.group_order || 999999);
                 },
                 ["asc"]
             );