From ef37f85d84bf4634406485be69329526a15504f0 Mon Sep 17 00:00:00 2001 From: nearbeach Date: Wed, 19 Jun 2024 21:26:41 +1000 Subject: [PATCH 1/5] Bugfix - nearbeach-1392 Users can duplicate new organisations --- src/js/components/organisations/NewOrganisation.vue | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/js/components/organisations/NewOrganisation.vue b/src/js/components/organisations/NewOrganisation.vue index 3e65fcd38..7b5e13f9c 100644 --- a/src/js/components/organisations/NewOrganisation.vue +++ b/src/js/components/organisations/NewOrganisation.vue @@ -130,6 +130,7 @@ @@ -165,6 +166,7 @@ export default { }, data() { return { + disableSubmitButton: false, duplicateOrganisations: [], organisationNameModel: "", organisationWebsiteModel: "", @@ -244,6 +246,9 @@ export default { return data_to_send; }, uploadOrganisationData() { + //Disable the upload button + this.disableSubmitButton = true; + //Use Axios to send the data //Get the data to send this.axios.post( @@ -259,6 +264,9 @@ export default { extra_classes: "bg-danger", delay: 0, }); + + //Enable the submit button + this.disableSubmitButton = false; }); }, }, From 257616ad9d4fab08ada3c417373fa4f33ac047f5 Mon Sep 17 00:00:00 2001 From: nearbeach Date: Wed, 19 Jun 2024 21:31:10 +1000 Subject: [PATCH 2/5] bugfix - nearbeach-1393 'Back to Group List' need more margin top --- src/js/components/groups/GroupInformation.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/js/components/groups/GroupInformation.vue b/src/js/components/groups/GroupInformation.vue index f67478006..1ca87f470 100644 --- a/src/js/components/groups/GroupInformation.vue +++ b/src/js/components/groups/GroupInformation.vue @@ -2,9 +2,8 @@
-

Group Information

+

Group Information

Back to group list
From f93df42fde0e25970bd0400d2b9bda28ad308608 Mon Sep 17 00:00:00 2001 From: nearbeach Date: Wed, 19 Jun 2024 21:33:02 +1000 Subject: [PATCH 3/5] Bugfix - Customer Information 'Go Back to customer search' needs margin top --- src/js/components/customers/CustomerInformation.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/js/components/customers/CustomerInformation.vue b/src/js/components/customers/CustomerInformation.vue index 693b555db..66cabe879 100644 --- a/src/js/components/customers/CustomerInformation.vue +++ b/src/js/components/customers/CustomerInformation.vue @@ -3,9 +3,8 @@
-

Customer Information

+

Customer Information

Go back to customer search
From 7ba8c0fbe6860a120008d14d937cc26a03c229c0 Mon Sep 17 00:00:00 2001 From: nearbeach Date: Wed, 19 Jun 2024 21:58:02 +1000 Subject: [PATCH 4/5] Bugfix - nearbeach-1368 Finished Sprint can still have the objects manipulation --- .../components/gantt_chart/GanttInformation.vue | 16 ++++++++++++++++ src/js/components/gantt_chart/RenderGanttRow.vue | 10 +++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/js/components/gantt_chart/GanttInformation.vue b/src/js/components/gantt_chart/GanttInformation.vue index 4acf95463..e50bc17a2 100644 --- a/src/js/components/gantt_chart/GanttInformation.vue +++ b/src/js/components/gantt_chart/GanttInformation.vue @@ -14,6 +14,7 @@ :key="index" v-bind:end-date="row.end_date" v-bind:index="index" + v-bind:is-closed="isParentClosed()" v-bind:object-id="row.object_id" v-bind:object-type="row.object_type" v-bind:higher-order-status="row.higher_order_status" @@ -89,6 +90,10 @@ export default { type: Number, default: 0, }, + parentStatus: { + type: String, + default: "", + }, rootUrl: { type: String, default: "/", @@ -192,6 +197,14 @@ export default { }); }) }, + isParentClosed() { + const closed_status = [ + 'finished', + 'closed', + ]; + + return closed_status.includes(this.parentStatus.toLowerCase()); + }, mouseDown(data) { //Update the mouse down variables this.mdClientXInitial = data.mdClientXInitial; @@ -227,6 +240,9 @@ export default { //Prevents default event.preventDefault(); + //If closed do nothing + if (this.isParentClosed()) return; + //Make sure not on a touch device const touch = matchMedia('(hover: none)').matches; if (touch) return; diff --git a/src/js/components/gantt_chart/RenderGanttRow.vue b/src/js/components/gantt_chart/RenderGanttRow.vue index b19ec507b..4f08fa2ba 100644 --- a/src/js/components/gantt_chart/RenderGanttRow.vue +++ b/src/js/components/gantt_chart/RenderGanttRow.vue @@ -9,7 +9,7 @@ v-model:value="localStartDate" type="datetime" @update:value="modifiedStartDate" - :disabled="userLevel <= 1" + :disabled="userLevel <= 1 || isClosed" :format="datePickerFormat" />
@@ -18,7 +18,7 @@ v-model:value="localEndDate" type="datetime" @update:value="modifiedEndDate" - :disabled="userLevel <= 1" + :disabled="userLevel <= 1 || isClosed" :format="datePickerFormat" >
@@ -27,7 +27,7 @@ v-model:value="localStatusId" :options="statusList" :on-update-value="updateStatus" - :disabled="userLevel <= 1" + :disabled="userLevel <= 1 || isClosed" >
@@ -90,6 +90,10 @@ export default { type: Number, default: 0, }, + isClosed: { + type: Boolean, + default: false, + }, objectId: { type: Number, default: 0, From 54840f803d4272d8c07eb9519c81e134670025e1 Mon Sep 17 00:00:00 2001 From: nearbeach Date: Wed, 19 Jun 2024 22:02:45 +1000 Subject: [PATCH 5/5] Release 0.31.28 --- NearBeach/static/NearBeach/NearBeach.min.js | 2 +- .../static/NearBeach/NearBeach.min.js.gz | Bin 150335 -> 150349 bytes .../NearBeach/customer-information.min.js | 2 +- .../NearBeach/customer-information.min.js.gz | Bin 3089 -> 3090 bytes .../static/NearBeach/gantt-information.min.js | 2 +- .../NearBeach/gantt-information.min.js.gz | Bin 3615 -> 3691 bytes .../static/NearBeach/group-information.min.js | 2 +- .../NearBeach/group-information.min.js.gz | Bin 1812 -> 1807 bytes .../NearBeach/new-permission-set.min.js | 2 +- .../NearBeach/new-permission-set.min.js.gz | Bin 5002 -> 5027 bytes ...components_modules_sub_modul-f023aa.min.js | 4 +++- ...ponents_modules_sub_modul-f023aa.min.js.gz | Bin 39369 -> 39496 bytes ...components_modules_wizards_C-8cf061.min.js | 3 ++- ...ponents_modules_wizards_C-8cf061.min.js.gz | Bin 12746 -> 12674 bytes ...js_components_request_for_ch-d33824.min.js | 6 +++++- ...components_request_for_ch-d33824.min.js.gz | Bin 17753 -> 18288 bytes ...mce-vue_lib_es2015_main_ts_index_js.min.js | 10 ++++++++-- ...-vue_lib_es2015_main_ts_index_js.min.js.gz | Bin 9879 -> 9920 bytes .../NearBeach/sprints/sprint_information.html | 1 + NearBeach/views/sprint_views.py | 1 + package-lock.json | 12 ++++++------ 21 files changed, 31 insertions(+), 16 deletions(-) diff --git a/NearBeach/static/NearBeach/NearBeach.min.js b/NearBeach/static/NearBeach/NearBeach.min.js index e91a62e21..0e1ee58c6 100644 --- a/NearBeach/static/NearBeach/NearBeach.min.js +++ b/NearBeach/static/NearBeach/NearBeach.min.js @@ -1,2 +1,2 @@ /*! For license information please see NearBeach.min.js.LICENSE.txt */ -(()=>{"use strict";var t,e,r={6795:(t,e,r)=>{r.d(e,{A:()=>o});const o=function(t){for(var e,r=0,o=0,n=t.length;n>=4;++o,n-=4)e=1540483477*(65535&(e=255&t.charCodeAt(o)|(255&t.charCodeAt(++o))<<8|(255&t.charCodeAt(++o))<<16|(255&t.charCodeAt(++o))<<24))+(59797*(e>>>16)<<16),r=1540483477*(65535&(e^=e>>>24))+(59797*(e>>>16)<<16)^1540483477*(65535&r)+(59797*(r>>>16)<<16);switch(n){case 3:r^=(255&t.charCodeAt(o+2))<<16;case 2:r^=(255&t.charCodeAt(o+1))<<8;case 1:r=1540483477*(65535&(r^=255&t.charCodeAt(o)))+(59797*(r>>>16)<<16)}return(((r=1540483477*(65535&(r^=r>>>13))+(59797*(r>>>16)<<16))^r>>>15)>>>0).toString(36)}},8764:(t,e,r)=>{r.r(e),r.d(e,{BASE_TRANSITION:()=>l,BindingTypes:()=>wo,CAMELIZE:()=>L,CAPITALIZE:()=>R,CREATE_BLOCK:()=>d,CREATE_COMMENT:()=>b,CREATE_ELEMENT_BLOCK:()=>p,CREATE_ELEMENT_VNODE:()=>m,CREATE_SLOTS:()=>E,CREATE_STATIC:()=>g,CREATE_TEXT:()=>f,CREATE_VNODE:()=>u,CompilerDeprecationTypes:()=>Et,ConstantTypes:()=>W,DOMDirectiveTransforms:()=>Xo,DOMErrorCodes:()=>Fo,DOMErrorMessages:()=>zo,DOMNodeTransforms:()=>qo,ElementTypes:()=>X,ErrorCodes:()=>Rt,FRAGMENT:()=>n,GUARD_REACTIVE_PROPS:()=>N,IS_MEMO_SAME:()=>U,IS_REF:()=>V,KEEP_ALIVE:()=>s,MERGE_PROPS:()=>T,NORMALIZE_CLASS:()=>O,NORMALIZE_PROPS:()=>C,NORMALIZE_STYLE:()=>A,Namespaces:()=>G,NodeTypes:()=>q,OPEN_BLOCK:()=>c,POP_SCOPE_ID:()=>j,PUSH_SCOPE_ID:()=>P,RENDER_LIST:()=>_,RENDER_SLOT:()=>k,RESOLVE_COMPONENT:()=>h,RESOLVE_DIRECTIVE:()=>y,RESOLVE_DYNAMIC_COMPONENT:()=>v,RESOLVE_FILTER:()=>x,SET_BLOCK_TRACKING:()=>D,SUSPENSE:()=>a,TELEPORT:()=>i,TO_DISPLAY_STRING:()=>S,TO_HANDLERS:()=>I,TO_HANDLER_KEY:()=>M,TRANSITION:()=>Io,TRANSITION_GROUP:()=>Lo,TS_NODE_TYPES:()=>Gt,UNREF:()=>z,V_MODEL_CHECKBOX:()=>Eo,V_MODEL_DYNAMIC:()=>Oo,V_MODEL_RADIO:()=>ko,V_MODEL_SELECT:()=>To,V_MODEL_TEXT:()=>So,V_ON_WITH_KEYS:()=>Co,V_ON_WITH_MODIFIERS:()=>Ao,V_SHOW:()=>No,WITH_CTX:()=>F,WITH_DIRECTIVES:()=>w,WITH_MEMO:()=>$,advancePositionWithClone:()=>oe,advancePositionWithMutation:()=>ne,assert:()=>ie,baseCompile:()=>xo,baseParse:()=>rr,buildDirectiveArgs:()=>Zr,buildProps:()=>Yr,buildSlots:()=>Ur,checkCompatEnabled:()=>At,compile:()=>Wo,convertToBlock:()=>gt,createArrayExpression:()=>Z,createAssignmentExpression:()=>pt,createBlockStatement:()=>lt,createCacheExpression:()=>st,createCallExpression:()=>nt,createCompilerError:()=>Lt,createCompoundExpression:()=>ot,createConditionalExpression:()=>at,createDOMCompilerError:()=>jo,createForLoopParams:()=>jr,createFunctionExpression:()=>it,createIfStatement:()=>dt,createInterpolation:()=>rt,createObjectExpression:()=>Q,createObjectProperty:()=>tt,createReturnStatement:()=>mt,createRoot:()=>K,createSequenceExpression:()=>ut,createSimpleExpression:()=>et,createStructuralDirectiveTransform:()=>fr,createTemplateLiteral:()=>ct,createTransformContext:()=>ur,createVNodeCall:()=>J,errorMessages:()=>Mt,extractIdentifiers:()=>$t,findDir:()=>ae,findProp:()=>se,forAliasRE:()=>we,generate:()=>vr,generateCodeFrame:()=>o.generateCodeFrame,getBaseTransformPreset:()=>yo,getConstantType:()=>ar,getMemoedVNodeCall:()=>xe,getVNodeBlockHelper:()=>ft,getVNodeHelper:()=>bt,hasDynamicKeyVBind:()=>ce,hasScopeRef:()=>ye,helperNameMap:()=>B,injectProp:()=>ge,isCoreComponent:()=>Wt,isFunctionType:()=>Ut,isInDestructureAssignment:()=>jt,isInNewExpression:()=>Ft,isMemberExpression:()=>re,isMemberExpressionBrowser:()=>te,isMemberExpressionNode:()=>ee,isReferencedIdentifier:()=>Pt,isSimpleIdentifier:()=>Kt,isSlotOutlet:()=>me,isStaticArgOf:()=>le,isStaticExp:()=>Xt,isStaticProperty:()=>Bt,isStaticPropertyKey:()=>Ht,isTemplateNode:()=>ue,isText:()=>de,isVSlot:()=>pe,locStub:()=>Y,noopDirectiveTransform:()=>_o,parse:()=>Yo,parserOptions:()=>Mo,processExpression:()=>Or,processFor:()=>Dr,processIf:()=>Nr,processSlotOutlet:()=>eo,registerRuntimeHelpers:()=>H,resolveComponentType:()=>Wr,stringifyExpression:()=>Ar,toValidAssetId:()=>ve,trackSlotScopes:()=>zr,trackVForSlotScopes:()=>Vr,transform:()=>mr,transformBind:()=>no,transformElement:()=>Xr,transformExpression:()=>Tr,transformModel:()=>co,transformOn:()=>oo,transformStyle:()=>Do,traverseNode:()=>br,unwrapTSNode:()=>qt,walkBlockDeclarations:()=>Vt,walkFunctionParams:()=>zt,walkIdentifiers:()=>Dt,warnDeprecation:()=>Ct});var o=r(33);const n=Symbol(""),i=Symbol(""),a=Symbol(""),s=Symbol(""),l=Symbol(""),c=Symbol(""),d=Symbol(""),p=Symbol(""),u=Symbol(""),m=Symbol(""),b=Symbol(""),f=Symbol(""),g=Symbol(""),h=Symbol(""),v=Symbol(""),y=Symbol(""),x=Symbol(""),w=Symbol(""),_=Symbol(""),k=Symbol(""),E=Symbol(""),S=Symbol(""),T=Symbol(""),O=Symbol(""),A=Symbol(""),C=Symbol(""),N=Symbol(""),I=Symbol(""),L=Symbol(""),R=Symbol(""),M=Symbol(""),D=Symbol(""),P=Symbol(""),j=Symbol(""),F=Symbol(""),z=Symbol(""),V=Symbol(""),$=Symbol(""),U=Symbol(""),B={[n]:"Fragment",[i]:"Teleport",[a]:"Suspense",[s]:"KeepAlive",[l]:"BaseTransition",[c]:"openBlock",[d]:"createBlock",[p]:"createElementBlock",[u]:"createVNode",[m]:"createElementVNode",[b]:"createCommentVNode",[f]:"createTextVNode",[g]:"createStaticVNode",[h]:"resolveComponent",[v]:"resolveDynamicComponent",[y]:"resolveDirective",[x]:"resolveFilter",[w]:"withDirectives",[_]:"renderList",[k]:"renderSlot",[E]:"createSlots",[S]:"toDisplayString",[T]:"mergeProps",[O]:"normalizeClass",[A]:"normalizeStyle",[C]:"normalizeProps",[N]:"guardReactiveProps",[I]:"toHandlers",[L]:"camelize",[R]:"capitalize",[M]:"toHandlerKey",[D]:"setBlockTracking",[P]:"pushScopeId",[j]:"popScopeId",[F]:"withCtx",[z]:"unref",[V]:"isRef",[$]:"withMemo",[U]:"isMemoSame"};function H(t){Object.getOwnPropertySymbols(t).forEach((e=>{B[e]=t[e]}))}const G={HTML:0,0:"HTML",SVG:1,1:"SVG",MATH_ML:2,2:"MATH_ML"},q={ROOT:0,0:"ROOT",ELEMENT:1,1:"ELEMENT",TEXT:2,2:"TEXT",COMMENT:3,3:"COMMENT",SIMPLE_EXPRESSION:4,4:"SIMPLE_EXPRESSION",INTERPOLATION:5,5:"INTERPOLATION",ATTRIBUTE:6,6:"ATTRIBUTE",DIRECTIVE:7,7:"DIRECTIVE",COMPOUND_EXPRESSION:8,8:"COMPOUND_EXPRESSION",IF:9,9:"IF",IF_BRANCH:10,10:"IF_BRANCH",FOR:11,11:"FOR",TEXT_CALL:12,12:"TEXT_CALL",VNODE_CALL:13,13:"VNODE_CALL",JS_CALL_EXPRESSION:14,14:"JS_CALL_EXPRESSION",JS_OBJECT_EXPRESSION:15,15:"JS_OBJECT_EXPRESSION",JS_PROPERTY:16,16:"JS_PROPERTY",JS_ARRAY_EXPRESSION:17,17:"JS_ARRAY_EXPRESSION",JS_FUNCTION_EXPRESSION:18,18:"JS_FUNCTION_EXPRESSION",JS_CONDITIONAL_EXPRESSION:19,19:"JS_CONDITIONAL_EXPRESSION",JS_CACHE_EXPRESSION:20,20:"JS_CACHE_EXPRESSION",JS_BLOCK_STATEMENT:21,21:"JS_BLOCK_STATEMENT",JS_TEMPLATE_LITERAL:22,22:"JS_TEMPLATE_LITERAL",JS_IF_STATEMENT:23,23:"JS_IF_STATEMENT",JS_ASSIGNMENT_EXPRESSION:24,24:"JS_ASSIGNMENT_EXPRESSION",JS_SEQUENCE_EXPRESSION:25,25:"JS_SEQUENCE_EXPRESSION",JS_RETURN_STATEMENT:26,26:"JS_RETURN_STATEMENT"},X={ELEMENT:0,0:"ELEMENT",COMPONENT:1,1:"COMPONENT",SLOT:2,2:"SLOT",TEMPLATE:3,3:"TEMPLATE"},W={NOT_CONSTANT:0,0:"NOT_CONSTANT",CAN_SKIP_PATCH:1,1:"CAN_SKIP_PATCH",CAN_HOIST:2,2:"CAN_HOIST",CAN_STRINGIFY:3,3:"CAN_STRINGIFY"},Y={start:{line:1,column:1,offset:0},end:{line:1,column:1,offset:0},source:""};function K(t,e=""){return{type:0,source:e,children:t,helpers:new Set,components:[],directives:[],hoists:[],imports:[],cached:0,temps:0,codegenNode:void 0,loc:Y}}function J(t,e,r,o,n,i,a,s=!1,l=!1,d=!1,p=Y){return t&&(s?(t.helper(c),t.helper(ft(t.inSSR,d))):t.helper(bt(t.inSSR,d)),a&&t.helper(w)),{type:13,tag:e,props:r,children:o,patchFlag:n,dynamicProps:i,directives:a,isBlock:s,disableTracking:l,isComponent:d,loc:p}}function Z(t,e=Y){return{type:17,loc:e,elements:t}}function Q(t,e=Y){return{type:15,loc:e,properties:t}}function tt(t,e){return{type:16,loc:Y,key:(0,o.isString)(t)?et(t,!0):t,value:e}}function et(t,e=!1,r=Y,o=0){return{type:4,loc:r,content:t,isStatic:e,constType:e?3:o}}function rt(t,e){return{type:5,loc:e,content:(0,o.isString)(t)?et(t,!1,e):t}}function ot(t,e=Y){return{type:8,loc:e,children:t}}function nt(t,e=[],r=Y){return{type:14,loc:r,callee:t,arguments:e}}function it(t,e=void 0,r=!1,o=!1,n=Y){return{type:18,params:t,returns:e,newline:r,isSlot:o,loc:n}}function at(t,e,r,o=!0){return{type:19,test:t,consequent:e,alternate:r,newline:o,loc:Y}}function st(t,e,r=!1){return{type:20,index:t,value:e,isVNode:r,loc:Y}}function lt(t){return{type:21,body:t,loc:Y}}function ct(t){return{type:22,elements:t,loc:Y}}function dt(t,e,r){return{type:23,test:t,consequent:e,alternate:r,loc:Y}}function pt(t,e){return{type:24,left:t,right:e,loc:Y}}function ut(t){return{type:25,expressions:t,loc:Y}}function mt(t){return{type:26,returns:t,loc:Y}}function bt(t,e){return t||e?u:m}function ft(t,e){return t||e?d:p}function gt(t,{helper:e,removeHelper:r,inSSR:o}){t.isBlock||(t.isBlock=!0,r(bt(o,t.isComponent)),e(c),e(ft(o,t.isComponent)))}const ht=new Uint8Array([123,123]),vt=new Uint8Array([125,125]);function yt(t){return t>=97&&t<=122||t>=65&&t<=90}function xt(t){return 32===t||10===t||9===t||12===t||13===t}function wt(t){return 47===t||62===t||xt(t)}function _t(t){const e=new Uint8Array(t.length);for(let r=0;r`.sync modifier for v-bind has been removed. Use v-model with argument instead. \`v-bind:${t}.sync\` should be changed to \`v-model:${t}\`.`,link:"https://v3-migration.vuejs.org/breaking-changes/v-model.html"},COMPILER_V_BIND_OBJECT_ORDER:{message:'v-bind="obj" usage is now order sensitive and behaves like JavaScript object spread: it will now overwrite an existing non-mergeable attribute that appears before v-bind in the case of conflict. To retain 2.x behavior, move v-bind to make it the first attribute. You can also suppress this warning if the usage is intended.',link:"https://v3-migration.vuejs.org/breaking-changes/v-bind.html"},COMPILER_V_ON_NATIVE:{message:".native modifier for v-on has been removed as is no longer necessary.",link:"https://v3-migration.vuejs.org/breaking-changes/v-on-native-modifier-removed.html"},COMPILER_V_IF_V_FOR_PRECEDENCE:{message:"v-if / v-for precedence when used on the same element has changed in Vue 3: v-if now takes higher precedence and will no longer have access to v-for scope variables. It is best to avoid the ambiguity with