Skip to content

Add bulk carry forward feature #4804

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CarolineDenis merged 72 commits into from
Jul 15, 2024
Merged

Add bulk carry forward feature #4804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
f1c1404
Add bulk carry forward
CarolineDenis Apr 16, 2024
0680b87
Add serie data entry feature
CarolineDenis Apr 17, 2024
b8ba0aa
Lint code with ESLint and Prettier
CarolineDenis Apr 17, 2024
a52b782
Create record set when carry bulk (start work)
CarolineDenis Apr 22, 2024
0638e98
Renaming
CarolineDenis Apr 22, 2024
d4a2a1b
Lint code with ESLint and Prettier
CarolineDenis Apr 22, 2024
846bc2a
Display bulk carry only for fictious rc
CarolineDenis Apr 22, 2024
5cf1c90
remove for loop + display bulk only for saved COs
CarolineDenis Apr 23, 2024
97b1a7a
Lint code with ESLint and Prettier
CarolineDenis Apr 23, 2024
533511d
Merge remote-tracking branch 'origin/production' into issue-545
CarolineDenis Apr 30, 2024
cc5bda5
Add cat number to record set name
CarolineDenis Apr 30, 2024
b9400bb
Chnage ids array type
CarolineDenis Apr 30, 2024
aa8cf79
Lint code with ESLint and Prettier
CarolineDenis Apr 30, 2024
b05fa4a
Change types
CarolineDenis Apr 30, 2024
69f22bc
Remove await
CarolineDenis May 1, 2024
e3979d4
Lint code with ESLint and Prettier
CarolineDenis May 1, 2024
72ab487
Merge remote-tracking branch 'origin/production' into issue-545
CarolineDenis May 6, 2024
c6005bc
Lint code with ESLint and Prettier
CarolineDenis May 6, 2024
85342bf
Simplify code
CarolineDenis May 21, 2024
aebdfe8
Merge remote-tracking branch 'origin/production' into issue-545
sharadsw Jun 7, 2024
f795c9d
remove outdated code after merge
sharadsw Jun 7, 2024
a384307
Revert "remove outdated code after merge"
sharadsw Jun 7, 2024
c9eca7a
Add TODO for future reference
sharadsw Jun 7, 2024
99c0146
change onAdd to accept an array of resources
sharadsw Jun 7, 2024
453e706
Improve for loop
sharadsw Jun 10, 2024
38e0247
Fix onAdd typechecks
sharadsw Jun 10, 2024
606956d
Lint code with ESLint and Prettier
sharadsw Jun 10, 2024
d58c266
Move bulk carry logic into RecordSet onClone
sharadsw Jun 11, 2024
e086d45
remove handleCarryBulk
sharadsw Jun 11, 2024
9d637b6
Merge remote-tracking branch 'origin/issue-545' into issue-545
sharadsw Jun 11, 2024
e245c95
Lint code with ESLint and Prettier
sharadsw Jun 11, 2024
e24c7f9
remove TODO
sharadsw Jun 11, 2024
96cc7f1
Keep carry forward btn when triggered
CarolineDenis Jun 17, 2024
15bc3ef
Lint code with ESLint and Prettier
CarolineDenis Jun 17, 2024
5f206b0
Add focus to input
CarolineDenis Jun 21, 2024
242850b
Remove bulk carry from RS
CarolineDenis Jun 21, 2024
2d68d5e
Remove bulk button, add bulk carry to meta
CarolineDenis Jun 24, 2024
3fe7b91
Change bulk stirng
CarolineDenis Jun 24, 2024
9383b78
Remove bulk carry from footer when unchecked in meta
CarolineDenis Jul 2, 2024
0544dcb
Merge remote-tracking branch 'origin/production' into issue-545
CarolineDenis Jul 2, 2024
af1caec
fix deadlock with collection_dispatch_bulk
acwhite211 Jul 3, 2024
cdd035d
fix resp HttpResponse mypy error
acwhite211 Jul 5, 2024
5fb760f
Cleanup OpenAPI Schema endpoints
melton-jason Jul 5, 2024
4963a41
Add documentation for bulk endpoint
melton-jason Jul 5, 2024
74a8158
Correct POST request response statuses
melton-jason Jul 5, 2024
96261db
Start use of new API call
CarolineDenis Jul 5, 2024
fdd9553
Add missing api
CarolineDenis Jul 5, 2024
ebd4b74
Typo
CarolineDenis Jul 5, 2024
691d97c
revert deadlock hack
acwhite211 Jul 5, 2024
7100fde
json loads request body
acwhite211 Jul 8, 2024
f2b35e8
Small fixes
CarolineDenis Jul 8, 2024
c815366
edit json response to handle lists with safe=False
acwhite211 Jul 8, 2024
312cd31
Merge branch 'issue-545' of https://github.com/specify/specify7 into …
acwhite211 Jul 8, 2024
8830185
decorate collection_dispatch_bulk as atomic transaction
acwhite211 Jul 8, 2024
0e1f95e
add collection_bulk_copy api
acwhite211 Jul 8, 2024
e786ff3
fix schema mypy error
acwhite211 Jul 8, 2024
2f0dbe4
fix argument error
acwhite211 Jul 8, 2024
f4ae91d
Remove import
CarolineDenis Jul 8, 2024
af59929
filter out id field if present
acwhite211 Jul 8, 2024
5ec7e6d
Merge branch 'issue-545' of https://github.com/specify/specify7 into …
acwhite211 Jul 8, 2024
c20bddf
add schema for collection_dispatch_bulk_copy
acwhite211 Jul 8, 2024
2dc0ad2
Handle NaN for bulk carry, revert chnage in API response
CarolineDenis Jul 9, 2024
bc06abf
Directly return not allowed when applicable
melton-jason Jul 9, 2024
87bccad
Merge remote-tracking branch 'origin/production' into issue-545
CarolineDenis Jul 9, 2024
9960983
Update specifyweb/specify/schema.py
CarolineDenis Jul 9, 2024
015672a
revert back to array response
acwhite211 Jul 10, 2024
741cb3e
collection_dispatch_bulk_copy return fix
acwhite211 Jul 10, 2024
2b3ac29
Run new record set batch only if table is CO
CarolineDenis Jul 10, 2024
cc4239f
Enable bulk carry for traditional cat number format only
CarolineDenis Jul 10, 2024
bdd09df
Simplify code
CarolineDenis Jul 10, 2024
ad52581
Merge remote-tracking branch 'origin/production' into issue-545
CarolineDenis Jul 12, 2024
3cea1c3
Fix bugs and tighten conditional disabling bulk clone
melton-jason Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion specifyweb/frontend/js_src/lib/components/AppResources/Editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ export function AppResourceEditor({
onAdd={
hasToolPermission('resources', 'create') &&
typeof handleClone === 'function'
? (newResource): void => {
? ([newResource]): void => {
const resource = serializeResource(newResource);
const isClone = typeof resource.spAppResourceDir === 'string';
handleClone(
Expand Down
41 changes: 41 additions & 0 deletions ...frontend/js_src/lib/components/FieldFormatters/__tests__/__snapshots__/index.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,34 +9,39 @@ exports[`field formatters are fetched and parsed correctly 1`] = `
"byYear": true,
"pattern": undefined,
"size": 4,
"type": "year",
"value": "YEAR",
},
SeparatorField {
"autoIncrement": false,
"byYear": false,
"pattern": undefined,
"size": 1,
"type": "separator",
"value": "-",
},
AlphaNumberField {
"autoIncrement": false,
"byYear": false,
"pattern": undefined,
"size": 2,
"type": "alphanumeric",
"value": "AA",
},
SeparatorField {
"autoIncrement": false,
"byYear": false,
"pattern": undefined,
"size": 1,
"type": "separator",
"value": "-",
},
NumericField {
"autoIncrement": true,
"byYear": false,
"pattern": undefined,
"size": 3,
"type": "numeric",
"value": "###",
},
],
Expand All @@ -51,34 +56,39 @@ exports[`field formatters are fetched and parsed correctly 1`] = `
"byYear": true,
"pattern": undefined,
"size": 4,
"type": "year",
"value": "YEAR",
},
SeparatorField {
"autoIncrement": false,
"byYear": false,
"pattern": undefined,
"size": 1,
"type": "separator",
"value": "-",
},
AlphaNumberField {
"autoIncrement": false,
"byYear": false,
"pattern": undefined,
"size": 2,
"type": "alphanumeric",
"value": "AA",
},
SeparatorField {
"autoIncrement": false,
"byYear": false,
"pattern": undefined,
"size": 1,
"type": "separator",
"value": "-",
},
AlphaNumberField {
"autoIncrement": false,
"byYear": false,
"pattern": undefined,
"size": 3,
"type": "alphanumeric",
"value": "AAA",
},
],
Expand All @@ -93,6 +103,7 @@ exports[`field formatters are fetched and parsed correctly 1`] = `
"byYear": false,
"pattern": undefined,
"size": 10,
"type": "alphanumeric",
"value": "AAAAAAAAAA",
},
],
Expand All @@ -107,20 +118,23 @@ exports[`field formatters are fetched and parsed correctly 1`] = `
"byYear": false,
"pattern": undefined,
"size": 4,
"type": "year",
"value": "YEAR",
},
SeparatorField {
"autoIncrement": false,
"byYear": false,
"pattern": undefined,
"size": 1,
"type": "separator",
"value": "-",
},
NumericField {
"autoIncrement": true,
"byYear": false,
"pattern": undefined,
"size": 6,
"type": "numeric",
"value": "######",
},
],
Expand All @@ -135,20 +149,23 @@ exports[`field formatters are fetched and parsed correctly 1`] = `
"byYear": true,
"pattern": undefined,
"size": 4,
"type": "year",
"value": "YEAR",
},
SeparatorField {
"autoIncrement": false,
"byYear": false,
"pattern": undefined,
"size": 1,
"type": "separator",
"value": "-",
},
NumericField {
"autoIncrement": true,
"byYear": false,
"pattern": undefined,
"size": 6,
"type": "numeric",
"value": "######",
},
],
Expand All @@ -163,6 +180,7 @@ exports[`field formatters are fetched and parsed correctly 1`] = `
"byYear": false,
"pattern": undefined,
"size": 9,
"type": "numeric",
"value": "#########",
},
],
Expand All @@ -177,6 +195,7 @@ exports[`field formatters are fetched and parsed correctly 1`] = `
"byYear": false,
"pattern": "####[-A]",
"size": 1,
"type": "regex",
"value": "[0-9]{4}(-[A-Z])?",
},
],
Expand All @@ -197,34 +216,39 @@ exports[`field formatters are fetched and parsed correctly 1`] = `
"byYear": true,
"pattern": undefined,
"size": 4,
"type": "year",
"value": "YEAR",
},
SeparatorField {
"autoIncrement": false,
"byYear": false,
"pattern": undefined,
"size": 1,
"type": "separator",
"value": "-",
},
AlphaNumberField {
"autoIncrement": false,
"byYear": false,
"pattern": undefined,
"size": 2,
"type": "alphanumeric",
"value": "AA",
},
SeparatorField {
"autoIncrement": false,
"byYear": false,
"pattern": undefined,
"size": 1,
"type": "separator",
"value": "-",
},
NumericField {
"autoIncrement": false,
"byYear": false,
"pattern": undefined,
"size": 3,
"type": "numeric",
"value": "###",
},
],
Expand All @@ -239,20 +263,23 @@ exports[`field formatters are fetched and parsed correctly 1`] = `
"byYear": true,
"pattern": undefined,
"size": 4,
"type": "year",
"value": "YEAR",
},
SeparatorField {
"autoIncrement": false,
"byYear": false,
"pattern": undefined,
"size": 1,
"type": "separator",
"value": "-",
},
NumericField {
"autoIncrement": true,
"byYear": false,
"pattern": undefined,
"size": 3,
"type": "numeric",
"value": "###",
},
],
Expand All @@ -267,20 +294,23 @@ exports[`field formatters are fetched and parsed correctly 1`] = `
"byYear": true,
"pattern": undefined,
"size": 4,
"type": "year",
"value": "YEAR",
},
SeparatorField {
"autoIncrement": false,
"byYear": false,
"pattern": undefined,
"size": 1,
"type": "separator",
"value": "-",
},
NumericField {
"autoIncrement": true,
"byYear": false,
"pattern": undefined,
"size": 3,
"type": "numeric",
"value": "###",
},
],
Expand All @@ -295,6 +325,7 @@ exports[`field formatters are fetched and parsed correctly 1`] = `
"byYear": false,
"pattern": undefined,
"size": 9,
"type": "numeric",
"value": "#########",
},
],
Expand All @@ -309,20 +340,23 @@ exports[`field formatters are fetched and parsed correctly 1`] = `
"byYear": true,
"pattern": undefined,
"size": 4,
"type": "year",
"value": "YEAR",
},
SeparatorField {
"autoIncrement": false,
"byYear": false,
"pattern": undefined,
"size": 1,
"type": "separator",
"value": "-",
},
NumericField {
"autoIncrement": true,
"byYear": false,
"pattern": undefined,
"size": 3,
"type": "numeric",
"value": "###",
},
],
Expand All @@ -337,6 +371,7 @@ exports[`field formatters are fetched and parsed correctly 1`] = `
"byYear": false,
"pattern": undefined,
"size": 15,
"type": "numeric",
"value": "###############",
},
],
Expand All @@ -351,6 +386,7 @@ exports[`field formatters are fetched and parsed correctly 1`] = `
"byYear": false,
"pattern": undefined,
"size": 3,
"type": "numeric",
"value": "###",
},
],
Expand All @@ -365,6 +401,7 @@ exports[`field formatters are fetched and parsed correctly 1`] = `
"byYear": false,
"pattern": undefined,
"size": 10,
"type": "numeric",
"value": "##########",
},
],
Expand All @@ -379,6 +416,7 @@ exports[`field formatters are fetched and parsed correctly 1`] = `
"byYear": false,
"pattern": undefined,
"size": 10,
"type": "numeric",
"value": "##########",
},
],
Expand All @@ -393,6 +431,7 @@ exports[`field formatters are fetched and parsed correctly 1`] = `
"byYear": false,
"pattern": undefined,
"size": 10,
"type": "numeric",
"value": "##########",
},
],
Expand All @@ -407,6 +446,7 @@ exports[`field formatters are fetched and parsed correctly 1`] = `
"byYear": false,
"pattern": undefined,
"size": 10,
"type": "numeric",
"value": "##########",
},
],
Expand All @@ -421,6 +461,7 @@ exports[`field formatters are fetched and parsed correctly 1`] = `
"byYear": false,
"pattern": undefined,
"size": 5,
"type": "numeric",
"value": "#####",
},
],
Expand Down
Loading