verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

3870-models #975

Merged
carlosjr merged 9 commits from 3870-models into dev 2022-05-23 12:42:31 +00:00
Conversation 0 Commits 9 Files Changed 10 +171 -26
vicent commented 2022-05-17 08:41:01 +00:00
Contributor
Copy Link
No description provided.
vicent added the
CR / Tests passed
 label 2022-05-17 08:41:01 +00:00
vicent added 4 commits 2022-05-17 08:41:03 +00:00
gitea/salix/pipeline/head This commit looks good Details
bad90c12f4 feat: add required fields and models
gitea/salix/pipeline/head This commit looks good Details
ad80d0501c add fixtures
gitea/salix/pipeline/head This commit looks good Details
9eae1f479c add table vn.printer
carlosjr requested changes 2022-05-20 09:21:30 +00:00
back/models/app-version-control.json Outdated
@ -0,0 +17,4 @@
"version": {
"type": "string"
},
"IsVersionCritical": {
carlosjr commented 2022-05-20 08:53:14 +00:00
Contributor
Copy Link

typo: isVersionCritical

typo: isVersionCritical
vicent marked this conversation as resolved
back/models/app-version-control.json Outdated
@ -0,0 +18,4 @@
"type": "string"
},
"IsVersionCritical": {
"type": "number"
carlosjr commented 2022-05-20 08:51:47 +00:00
Contributor
Copy Link

isn't this a boolean?

isn't this a boolean?
vicent marked this conversation as resolved
back/models/machine-worker.json Outdated
@ -0,0 +17,4 @@
"machineFk": {
"type": "number"
},
"inTimed": {
carlosjr commented 2022-05-20 08:56:19 +00:00
Contributor
Copy Link

in timed, doesn't make sense, inTime can be what you are looking for.

in timed, doesn't make sense, inTime can be what you are looking for.
vicent marked this conversation as resolved
back/models/machine-worker.json Outdated
@ -0,0 +20,4 @@
"inTimed": {
"type": "date"
},
"outTimed": {
carlosjr commented 2022-05-20 08:58:08 +00:00
Contributor
Copy Link

outTimed doesn't make sense, may be outTime or timeOut is what you are looking for.

outTimed doesn't make sense, may be outTime or timeOut is what you are looking for.
vicent marked this conversation as resolved
db/dump/fixtures.sql Outdated
@ -2545,2 +2551,4 @@
(4, 2, 0, 20.00, 0.00, NULL, 0, 0.00, 0),
(5, 442, 0, 0.00, 3.05, NULL, 0, 0.00, 0);
INSERT INTO `vn`.`mobileAppVersionControl` (`appName`, `version`, `IsVersionCritical`)
carlosjr commented 2022-05-20 08:59:43 +00:00
Contributor
Copy Link

IsVersionCritical looks like a typo.

IsVersionCritical looks like a typo.
vicent marked this conversation as resolved
db/dump/fixtures.sql Outdated
@ -2547,0 +2558,4 @@
INSERT INTO `vn`.`machine` (`plate`, `maker`, `model`, `warehouseFk`, `departmentFk`, `type`, `use`, `productionYear`, `workerFk`, `companyFk`)
VALUES
('RE-001', 'STILL', 'LTX-20', 60, 23, 'REMOLCADOR ELECTRICO', 'Arrastrar carros', 2020, 103, 442),
carlosjr commented 2022-05-20 09:02:29 +00:00
Contributor
Copy Link

fixtures language is english by default

fixtures language is english by default
vicent marked this conversation as resolved
modules/worker/back/models/worker.json
@ -47,2 +47,4 @@
"SSN": {
"type" : "string"
},
"sectorFk": {
carlosjr commented 2022-05-20 09:21:22 +00:00
Contributor
Copy Link

it is of good practice to create the relations for foreign keys and their respective models if not created yet.

also the worker model doens't seem to be the best place to allocate such properties.

it is of good practice to create the relations for foreign keys and their respective models if not created yet. also the worker model doens't seem to be the best place to allocate such properties.
carlosjr commented 2022-05-23 09:48:42 +00:00
Contributor
Copy Link

remove this

remove this
vicent marked this conversation as resolved
carlosjr removed the
CR / Tests passed
 label 2022-05-20 09:21:48 +00:00
vicent added 1 commit 2022-05-20 10:53:24 +00:00
gitea/salix/pipeline/head This commit looks good Details
c9bfbe990a refactor: request changues
vicent added 1 commit 2022-05-20 10:56:43 +00:00
vicent added 1 commit 2022-05-20 11:11:08 +00:00
gitea/salix/pipeline/head This commit looks good Details
a043c5d346 refactor: request changes
vicent added the
CR / Tests passed
 label 2022-05-20 11:11:15 +00:00
vicent requested review from carlosjr 2022-05-20 11:11:22 +00:00
carlosjr requested changes 2022-05-23 09:49:27 +00:00
modules/worker/back/models/worker.json
@ -48,1 +48,4 @@
"type" : "string"
},
"sectorFk": {
"type" : "number"
carlosjr commented 2022-05-23 09:49:23 +00:00
Contributor
Copy Link

remove this prop

remove this prop
vicent marked this conversation as resolved
carlosjr removed the
CR / Tests passed
 label 2022-05-23 09:49:36 +00:00
vicent added 1 commit 2022-05-23 10:45:32 +00:00
gitea/salix/pipeline/head This commit looks good Details
db7638f153 refactor: sectorFk property deleted
vicent added the
CR / Tests passed
 label 2022-05-23 10:45:50 +00:00
vicent requested review from carlosjr 2022-05-23 10:45:54 +00:00
carlosjr added 1 commit 2022-05-23 12:33:16 +00:00
gitea/salix/pipeline/head This commit looks good Details
a76dd11825 Merge branch 'dev' into 3870-models
carlosjr approved these changes 2022-05-23 12:42:22 +00:00
carlosjr left a comment
Contributor
Copy Link

LGTM

LGTM
carlosjr merged commit 3dd872c720 into dev 2022-05-23 12:42:31 +00:00
carlosjr deleted branch 3870-models 2022-05-23 12:42:31 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
carlosjr
Labels
Clear labels   
CR / Tests passed

Unit tests and e2e passed

  
e2e

Implement e2e

  
Missing tests

Missing tests

  
Needs refactor

   
Simple

Simple check / No CR needed

No Label
CR / Tests passed
e2e
Missing tests
Needs refactor
Simple
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix#975
No description provided.
Delete Branch "3870-models"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?