Add support for more fields #375

romaninsh · 2019-01-07T01:01:48Z

implement types using DBAL first - #727

Implements separate classes for Number, Percent and Rating. Also includes Money for a basic implementation.

codecov · 2019-01-07T01:05:55Z

Codecov Report

Merging #375 into develop will decrease coverage by 1.66%.
The diff coverage is 65.63%.

@@              Coverage Diff              @@
##             develop     #375      +/-   ##
=============================================
- Coverage      86.70%   85.04%   -1.67%     
- Complexity      1232     1287      +55     
=============================================
  Files             28       37       +9     
  Lines           2730     2788      +58     
=============================================
+ Hits            2367     2371       +4     
- Misses           363      417      +54

Impacted Files	Coverage Δ	Complexity Δ
src/Field/Callback.php	`38.46% <0.00%> (-61.54%)`	`6.00 <4.00> (+4.00)`	⬇️
src/Field/Money.php	`0.00% <0.00%> (ø)`	`4.00 <4.00> (?)`
src/Field_SQL_Expression.php	`94.73% <ø> (+0.29%)`	`9.00 <0.00> (ø)`
src/Field/Email.php	`68.96% <11.11%> (-26.28%)`	`19.00 <7.00> (+6.00)`	⬇️
src/Field/Integer.php	`27.27% <27.27%> (ø)`	`6.00 <6.00> (?)`
src/Field/Line.php	`33.33% <33.33%> (ø)`	`5.00 <5.00> (?)`
src/Field/Text.php	`40.90% <40.90%> (ø)`	`13.00 <13.00> (?)`
src/Field/Numeric.php	`56.25% <56.25%> (ø)`	`21.00 <21.00> (?)`
src/Field.php	`63.82% <67.18%> (-14.70%)`	`57.00 <17.00> (-38.00)`
src/Field/DateTime.php	`80.00% <80.00%> (ø)`	`18.00 <18.00> (?)`
... and 45 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1230c3b...1230c3b. Read the comment docs.

…o feature/number-field

…ure/number-field

src/Field/Integer.php

romaninsh

WIP..

src/Field/Integer.php

src/Persistence/Array_.php

romaninsh · 2019-07-29T23:45:59Z

src/Field.php

-                throw new ValidationException([$this->name => 'Must not be empty']);
-            }
-            break;
+            throw new Exception(['Use Field\Text for type=text', 'this'=>$this]);


didnt' we agree on the meeting to keep backwards compatibility ?

if we accept that, it will break code in a very "python" way (no steady update path)

It should be BC so far. Derived field classes don't call parent::normalize() so this switch is not used at all. Theoretically all this normalize method in Field class can be removed, but not 100% yet. That's why I left it there for cases when Field->type === null (some custom fields).

romaninsh · 2019-08-01T20:09:46Z

src/Field.php

-                throw new ValidationException([$this->name => 'Must use scalar value']);
+        // only string type fields can use empty string as legit value, for all
+        // other field types empty value is the same as no-value, nothing or null
+        if ($f->type && $f->type != 'string' && $value === '') {


probably incorrect.......

what exactly?

romaninsh · 2019-08-01T20:10:09Z

src/Field.php

-            if (!$this->owner->strict_types) {
-                return $value;
+        if ($value === null) {
+            if ($this->required) {


rename into not_null

romaninsh · 2019-08-01T20:10:25Z

src/Field.php

-        } catch (Exception $e) {
-            $e->addMoreInfo('field', $this);
+        // validate scalar values
+        if (in_array($f->type, ['string', 'text', 'integer', 'money', 'float']) && !is_scalar($value)) {


we don't care about type, remove.

romaninsh · 2019-08-01T20:10:44Z

src/Field.php

-            throw $e;
+        // normalize
+        // @TODO remove this block in future - it's useless
+        switch ($f->type) {


switch not needed. remove.

romaninsh · 2019-08-01T20:11:20Z

src/Field.php

+     */
+    public function canBeNull() : bool
+    {
+        return $this->mandatory === false;


return !$this->not_null

romaninsh · 2019-08-01T20:20:18Z

src/Field/Object_.php

+        }
+
+        if (is_string($value) && $this->owner && $this->owner->persistence) {
+            $value = $this->owner->persistence->jsonDecode($this, $value, false);


is that needed ?

romaninsh · 2019-08-01T20:20:53Z

src/Field/Object_.php

+     *
+     * @return string
+     */
+    public function toString($value = null) : ?string


use native serialization

why? jsonEncode in persistence class is native, but better method because it treats exception cases better.

src/Field/_Percent.php

romaninsh · 2019-08-01T20:24:36Z

src/Model.php

    protected $typeToFieldSeed = [
-        'boolean' => ['Boolean'],
+        'boolean'  => ['Boolean'],
+        'float'    => ['Numeric'],


'float' => ['LegacyField', 'type'=>'float']

etc

src/Persistence/Array_.php

…sistence class

abbadon1334

LGTM, i agree to hardcode in some way the notNull exception

* badge * Feature/set custom edit exec button (#490) * fix one test * Setting current dependencies * use custom exec button on edit action * Update Model.php * remove class, use seed Co-authored-by: Imants Horsts <[email protected]> * model default add field property (#454) * use the object default add field property * no need for double brackets. * force tests Co-authored-by: Romans Malinovskis <[email protected]> Co-authored-by: Imants Horsts <[email protected]> * Fix empty array condition (#498) * more tests * Apply fixes from StyleCI * better implementation for addFields() and test cases (#499) * better implementation for addFields() and test cases * Apply fixes from StyleCI * use shorthand method * simplify code * implement `exprNow()` method. Rely on dsql PR. * Apply fixes from StyleCI * pass * add docs Co-authored-by: Romans Malinovskis <[email protected]> * Fix/ Small Action related fix (#502) * Fix/ Small Action related fix - Set Edit action exec button labe lto 'Save' by default - Set Edit action exec button colot to blue by default - Set default description for Add action in model - Add method to retreive model from Action * Apply fixes from StyleCI * fix comment Co-authored-by: Imants Horsts <[email protected]> * use property to define field seed properties * update field test * introduce expandable field type registry * update test to new properties * revert type setting * add shorthand int type declaration * refactor variable names for clarity and consistency * introduce Field::getTypecaster and Field::getSerializer methods * introduce registering field seeds from array * chore: refactor variable names for consistency Co-authored-by: Imants Horsts <[email protected]> Co-authored-by: Mimo <[email protected]> Co-authored-by: Romans Malinovskis <[email protected]> Co-authored-by: Alain Belair <[email protected]>

* badge * Feature/set custom edit exec button (#490) * fix one test * Setting current dependencies * use custom exec button on edit action * Update Model.php * remove class, use seed Co-authored-by: Imants Horsts <[email protected]> * model default add field property (#454) * use the object default add field property * no need for double brackets. * force tests Co-authored-by: Romans Malinovskis <[email protected]> Co-authored-by: Imants Horsts <[email protected]> * Fix empty array condition (#498) * more tests * Apply fixes from StyleCI * better implementation for addFields() and test cases (#499) * better implementation for addFields() and test cases * Apply fixes from StyleCI * use shorthand method * simplify code * implement `exprNow()` method. Rely on dsql PR. * Apply fixes from StyleCI * pass * add docs Co-authored-by: Romans Malinovskis <[email protected]> * Fix/ Small Action related fix (#502) * Fix/ Small Action related fix - Set Edit action exec button labe lto 'Save' by default - Set Edit action exec button colot to blue by default - Set default description for Add action in model - Add method to retreive model from Action * Apply fixes from StyleCI * fix comment Co-authored-by: Imants Horsts <[email protected]> * update multiple delete example (#503) * now supports multiple filter options in getFields() * Apply fixes from StyleCI * Accept any DateTimeInterface impl. for datetime (#505) * Accept any DateTimeInterface impl. for datetime * Fix DateTime::getTimezone method name * Fix setTimezone for any instance of DateTimeInterface * Add microseconds persistence support for datetime/time types + fix normalization/cloning issue (#504) * Fix datetime normalization cloning * Add microseconds persistence support for datetime/time types Co-authored-by: Imants Horsts <[email protected]> * include comment about hooks and example how to execute them (#510) * update composer * Update release-drafter.yml * Update bundler.yml * Fix hasOne relation seed processing. It should replace not merge. (#512) * New method $model->getTitles() (#513) * Implement `getTitles()` method * Apply fixes from StyleCI * Update unit-tests.yml * migration to migrator * rename addHook to onHook (#514) * fix #944 (#516) * allow dots in table names, fix #515, fix #517 * Apply fixes from StyleCI * Do not fail-fast PHP test matrix (#522) * Simplify code (#519) * Update release-drafter.yml * Update release-drafter.yml * Fix hook trait usage (#525) * Hook args must be an array * Fix hook onHook() usage * Apply fixes from StyleCI * initialization of fields and handling of expressions * Apply fixes from StyleCI * introduce hasPersistence and retrieval of setting * Apply fixes from StyleCI Co-authored-by: Imants Horsts <[email protected]> Co-authored-by: Mimo <[email protected]> Co-authored-by: Romans Malinovskis <[email protected]> Co-authored-by: Alain Belair <[email protected]> Co-authored-by: DarkSide <[email protected]> Co-authored-by: Michael Voříšek <[email protected]>

# Conflicts: # composer.json # locale/en/atk.php # locale/it/atk.php # locale/ru/atk.php # src/Field.php # src/Field/Boolean.php # src/Field/Callback.php # src/Field_SQL.php # src/Model.php # src/Persistence.php # src/Persistence/Array_.php # src/Persistence/SQL.php # src/Reference/HasOne.php # src/Reference/HasOne_SQL.php # src/Util/DeepCopy.php # tests/FieldTest.php # tests/FieldTypesTest.php # tests/RandomTest.php

mvorisek · 2021-04-19T21:42:24Z

A lot of changes are already integrated, different fields itself should be fixed in #727, closing this one.

romaninsh and others added 2 commits January 7, 2019 01:00

added number field support

e92df1b

Apply fixes from StyleCI

0f3e510

romaninsh changed the base branch from develop to feature/epic-field-refactor January 7, 2019 01:02

This was referenced Jan 7, 2019

Standard types overhaul #308

Closed

Epic refactor for "Field" class #314

Merged

romaninsh added 2 commits January 7, 2019 01:07

Merge remote-tracking branch 'origin/feature/epic-field-refactor' int…

24c11bf

…o feature/number-field

Merge branch 'feature/number-field' of github.com:atk4/data into feat…

9163e16

…ure/number-field

romaninsh added the Saasty.io 🏗️ Sponsored by SaaSsy.io - Online ATK app builder label Jan 8, 2019

abbadon1334 mentioned this pull request May 20, 2019

Create proposal for UI translations atk4/ui#715

Closed

7 tasks

DarkSide666 added 2 commits May 23, 2019 08:43

Update Money.php

43f8609

Update Money.php

df9af81

romaninsh mentioned this pull request Jul 10, 2019

Add email field validation #443

Closed

romaninsh changed the base branch from feature/epic-field-refactor to develop July 24, 2019 21:22

romaninsh and others added 7 commits July 24, 2019 22:23

Merge branch 'develop' into feature/number-field

3ff1856

fix Boolean field

191f41e

Apply fixes from StyleCI

3ffe431

implement Field/Numeric

8dba898

Apply fixes from StyleCI

83ae685

Implement Field/Integer and Field/Money

77d968d

Apply fixes from StyleCI

47d2b82

romaninsh commented Jul 25, 2019

View reviewed changes

src/Field/Integer.php Outdated Show resolved Hide resolved

DarkSide666 added 2 commits July 25, 2019 14:01

fix tests

fbf7f56

Apply fixes from StyleCI

23cc963

romaninsh commented Jul 25, 2019

View reviewed changes

src/Field/Integer.php Outdated Show resolved Hide resolved

src/Persistence/Array_.php Show resolved Hide resolved

DarkSide666 added 4 commits July 25, 2019 14:37

address Romans comments

0b4314e

simplify

140de66

add Text and ShortText fields

6e2cf00

shorttext

ad11ab2

romaninsh commented Jul 29, 2019

View reviewed changes

Apply fixes from StyleCI

0ebc62a

romaninsh commented Aug 1, 2019

View reviewed changes

DarkSide666 and others added 12 commits August 3, 2019 00:53

add id field seed property, remove type property usage from Array Per…

278b294

…sistence class

Apply fixes from StyleCI

11bc21b

Rename ShortText to Line

0b91520

Merge branch 'develop' into feature/number-field

81d1563

require more extensions

ea0fcaa

rename round methods

4139711

fix property name

0e1ecb8

fix Percent class

c51ef7a

address few comments

17a9d62

fix

a96b868

Merge branch 'develop' into feature/number-field

8c12cd9

fix tests

991cff4

DarkSide666 mentioned this pull request Oct 15, 2019

DropDown data-value=0 is treated as null atk4/ui#781

Closed

Merge branch 'develop' into feature/number-field

57f1ca2

romaninsh added the in review label Jan 9, 2020

abbadon1334 requested changes Jan 9, 2020

View reviewed changes

georgehristov and others added 4 commits February 24, 2020 22:20

Apply fixes from StyleCI

a8bd575

Apply fixes from StyleCI

22b478c

romaninsh mentioned this pull request Mar 29, 2020

Reuse Dropdown as much as possible in Lookup atk4/ui#1020

Open

georgehristov and others added 2 commits April 17, 2020 23:48

Apply fixes from StyleCI

1230c3b

mvorisek added waitingForAnotherPR and removed in review labels Sep 18, 2020

mvorisek closed this Apr 19, 2021

mvorisek deleted the feature/number-field branch April 19, 2021 21:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for more fields #375

Add support for more fields #375

romaninsh commented Jan 7, 2019 •

edited by mvorisek

Loading

codecov bot commented Jan 7, 2019 •

edited

Loading

romaninsh left a comment •

edited

Loading

romaninsh Jul 29, 2019

DarkSide666 Sep 25, 2019

romaninsh Aug 1, 2019

DarkSide666 Sep 25, 2019

romaninsh Aug 1, 2019

romaninsh Aug 1, 2019

romaninsh Aug 1, 2019

romaninsh Aug 1, 2019

romaninsh Aug 1, 2019

romaninsh Aug 1, 2019

DarkSide666 Sep 25, 2019

romaninsh Aug 1, 2019

abbadon1334 left a comment

mvorisek commented Apr 19, 2021

Add support for more fields #375

Add support for more fields #375

Conversation

romaninsh commented Jan 7, 2019 • edited by mvorisek Loading

codecov bot commented Jan 7, 2019 • edited Loading

Codecov Report

romaninsh left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

abbadon1334 left a comment

Choose a reason for hiding this comment

mvorisek commented Apr 19, 2021

romaninsh commented Jan 7, 2019 •

edited by mvorisek

Loading

codecov bot commented Jan 7, 2019 •

edited

Loading

romaninsh left a comment •

edited

Loading