From b92cf1e6203aec03fd1eb85947cf08e6df78c18a Mon Sep 17 00:00:00 2001 From: antoinezulke <32953659+antoinezulke@users.noreply.github.com> Date: Thu, 28 Dec 2017 15:47:45 +0100 Subject: [PATCH 1/2] Possibility to control which values are activated --- src/sugoi/form/elements/Enum.hx | 36 ++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/src/sugoi/form/elements/Enum.hx b/src/sugoi/form/elements/Enum.hx index 94d6f4b..c79cc8d 100644 --- a/src/sugoi/form/elements/Enum.hx +++ b/src/sugoi/form/elements/Enum.hx @@ -12,6 +12,7 @@ class Enum extends FormElement public var verticle:Bool; public var labelRight:Bool; var checked : Array; + public var activatedValues:Array; public var columns:Int; @@ -34,6 +35,7 @@ class Enum extends FormElement this.verticle = verticle; this.labelRight = labelRight; + //trace("value = " + value); @@ -44,6 +46,9 @@ class Enum extends FormElement } columns = 1; + + + this.activatedValues = new Array(); } override function getTypedValue(str:String):Int { @@ -62,6 +67,11 @@ class Enum extends FormElement return Type.resolveEnum(enumName).createByIndex(value); } + public function setActivatedValues(activatedValues:Array) + { + this.activatedValues = activatedValues; + } + override public function render():String { var s = ""; @@ -74,7 +84,23 @@ class Enum extends FormElement var c = 0; - var array = Type.allEnums(Type.resolveEnum(enumName)); + var array2 = Type.allEnums(Type.resolveEnum(enumName)); + //Filter the Enum with activatedValues + var array = new Array(); + if(this.activatedValues.length == 0) + { + array = array2; + } + else + { + for(v in this.activatedValues) + { + array.push(array2[v]); + } + } + + + var rowsPerColumn = Math.ceil(array.length / columns); s = ""; @@ -95,8 +121,12 @@ class Enum extends FormElement var label; var t = Form.translator; - - label = "\n"; + if (t == null){ + label = "\n"; + }else{ + label = "\n"; + } + if (labelRight) { From 333f7acf56ee6bb397defc3199cf519c34f53657 Mon Sep 17 00:00:00 2001 From: antoinezulke <32953659+antoinezulke@users.noreply.github.com> Date: Thu, 11 Jan 2018 14:27:19 +0100 Subject: [PATCH 2/2] Add files via upload Give the possibility to deactivate some flags --- src/sugoi/form/elements/Flags.hx | 37 ++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/src/sugoi/form/elements/Flags.hx b/src/sugoi/form/elements/Flags.hx index 47b6046..b55cc28 100644 --- a/src/sugoi/form/elements/Flags.hx +++ b/src/sugoi/form/elements/Flags.hx @@ -57,6 +57,8 @@ class Flags extends FormElement var checked : Array; public var columns:Int; + + public var flagsToRemove:Array; /** * @@ -86,11 +88,17 @@ class Flags extends FormElement } columns = 1; + + this.flagsToRemove = new Array(); + } + + public function setFlagsToRemove(flagsToRemove:Array) + { + this.flagsToRemove = flagsToRemove; } override public function populate() { - var v = Web.getParamValues(parentForm.name + "_" + name); value = 0; @@ -102,7 +110,6 @@ class Flags extends FormElement val.set( FakeFlag.createByIndex(Std.parseInt(vv)) ); //i++; } - value = val.toInt(); } @@ -118,12 +125,18 @@ class Flags extends FormElement { var s = ""; var n = parentForm.name + "_" +name; + + + var array = Lambda.array(data); var tagCss = getClasses(); var labelCss = getLabelClasses(); var c = 0; - var array = Lambda.array(data); + + + + if (array != null) { //trace("L" + array.length); @@ -142,12 +155,24 @@ class Flags extends FormElement var row:Dynamic = array[c]; - var checkbox = "\n"; - var label; + var checkbox = ""; + if(flagsToRemove.indexOf(row)==-1) + { + checkbox = "\n"; + } + else + { + checkbox = "\n"; + } + var label = ""; var t = Form.translator; - label = "\n"; + if(flagsToRemove.indexOf(row)==-1) + { + label = "\n"; + } + if (labelRight)