Skip to content
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.

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

Feature/3710 flagging journals #2426

Open
wants to merge 117 commits into
base: develop
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
117 commits
Select commit Hold shift + click to select a range
1f239a0
prototyping on flagging feature
richard-jones Oct 10, 2024
98c66dd
some prototyping around converting notes to flags
richard-jones Oct 17, 2024
80cdba3
remove erroneous import
richard-jones Oct 17, 2024
a598eb9
remove convert_to_flag converter
amdomanska Oct 23, 2024
155d846
Merge branch 'develop' into feature/3710_flagging_journals
amdomanska Oct 23, 2024
33d0d69
remove convert to flag continued
amdomanska Oct 23, 2024
f57f728
add flag structs to the notes
amdomanska Oct 23, 2024
5bd175e
add flag to the model and save from the form as a flag
amdomanska Oct 29, 2024
ed6c0b8
add 'clear flag' functionality
amdomanska Oct 29, 2024
7070a83
add 'has_flag' to index
amdomanska Oct 29, 2024
e58fb2a
add 'notes_except_flags' and 'flags' to journal model properties; all…
amdomanska Oct 29, 2024
2e600fb
display existing flag correctly in the form
amdomanska Oct 30, 2024
1097dad
make flags field repeatable with max 2 values - one for current, one …
amdomanska Oct 31, 2024
8763161
add resolve/unresolve flag
amdomanska Nov 11, 2024
0b29b96
change resolved flag into the note
amdomanska Nov 11, 2024
b68c9c1
only one flag ensured; buttons disabled and enabled correctly; resolv…
amdomanska Nov 11, 2024
b711329
now backend handled resolving and adding well
amdomanska Nov 11, 2024
0e0873d
automatic resolved by and resolved_on
amdomanska Nov 12, 2024
0ff3317
add accounts to assigned_to
amdomanska Nov 12, 2024
41b0759
add labels and change the order
amdomanska Nov 12, 2024
cb8139d
control who can add the field
amdomanska Nov 12, 2024
ed259a7
control who can add the field - fixed
amdomanska Nov 12, 2024
9870773
filters added; sort added but mapping is off
amdomanska Nov 12, 2024
48f49e8
Sorting by deadline
amdomanska Nov 13, 2024
167d7d7
Add info about flags to todo cars
amdomanska Nov 13, 2024
e0d86fe
UI filter in dashboard works
amdomanska Nov 13, 2024
e0b60a3
remove accidental file
amdomanska Nov 13, 2024
ae610ae
manage string None as filter
amdomanska Nov 13, 2024
a0d0b5f
sorting works
amdomanska Nov 14, 2024
d0f086f
flagged to me dashboard filter works
amdomanska Nov 14, 2024
0cc7416
small changes in fields names
amdomanska Nov 14, 2024
01f62d4
set up flag editing permissions
amdomanska Nov 14, 2024
17b16d2
styling: 1st pass
amdomanska Nov 14, 2024
ce5f444
add flag icon to flags inside journal form
amdomanska Nov 15, 2024
e095c46
fix flag_details value
amdomanska Nov 15, 2024
c081a32
styling: 2st pass
amdomanska Nov 15, 2024
af30681
fix filters in dashboard
amdomanska Nov 16, 2024
37e7e8a
add information about flags to search results
amdomanska Nov 16, 2024
3dd4805
styling pass 3; refactoring pass 1
amdomanska Nov 18, 2024
0d44d4f
Merge branch 'develop' into feature/3710_flagging_journals
amdomanska Nov 18, 2024
4eadaa2
revert dev_basics file
amdomanska Nov 19, 2024
4e88cb5
PR cleanup: add while line
amdomanska Nov 19, 2024
49c1090
PR cleanup: remove print
amdomanska Nov 19, 2024
60c1471
PR cleanup: change order of lines to make diff clearer
amdomanska Nov 19, 2024
1a204cf
PR cleanup: move FAR_IN_THE_FUTURE date to dates lib
amdomanska Nov 19, 2024
93faf9a
PR cleanup: use defined property
amdomanska Nov 19, 2024
0a4a00f
PR cleanup: revert beforeunload in application_form
amdomanska Nov 19, 2024
404aa54
PR cleanup: remove unnecessary space
amdomanska Nov 19, 2024
24a0845
PR cleanup: revert unnecessary change in autoccomplete
amdomanska Nov 19, 2024
c754797
remove unnecessary templates
amdomanska Nov 19, 2024
65beebf
remove unnecessary script
amdomanska Nov 19, 2024
d67960d
remove extra doaj.session.currentUser
amdomanska Nov 19, 2024
8a9e531
PR cleanup: newline in settings
amdomanska Nov 19, 2024
a8f0aef
PR cleanup: revert changes in core.py
amdomanska Nov 19, 2024
3377644
PR cleanup: remove prints
amdomanska Nov 19, 2024
3feecd3
Merge branch 'develop' into feature/3710_flagging_journals
richard-jones Dec 4, 2024
365e291
hide newFlagGroup correctly
amdomanska Dec 4, 2024
6aa466b
show new flag correctly
amdomanska Dec 4, 2024
a08d860
extract dates js library
amdomanska Dec 4, 2024
1852def
remove moment.js and add refactoring functions to doaj.dates lib
amdomanska Dec 4, 2024
49aad78
remove moment.js
amdomanska Dec 4, 2024
d331b1c
fix typo after dates refactoring
amdomanska Dec 4, 2024
86f6c8a
fix formulaic
amdomanska Dec 4, 2024
3780552
fix Notes
amdomanska Dec 9, 2024
5e71ebb
fix autocomplete
amdomanska Dec 9, 2024
46d72ab
fix autocomplete p2
amdomanska Dec 9, 2024
91513e1
remove required attribute from flag_assignee, add short help
amdomanska Dec 9, 2024
0cfe8f4
improve short help
amdomanska Dec 9, 2024
f9a34b6
style short help
amdomanska Dec 9, 2024
ab07ed2
fix the flagExists loop; improve dateParse functions
amdomanska Dec 9, 2024
d4cec93
hide deadline when appropriate
amdomanska Dec 9, 2024
882ffd9
adjust flag display
amdomanska Dec 9, 2024
94d40c3
Merge branch 'develop' into feature/3710_flagging_journals
amdomanska Jan 21, 2025
fe59f7e
reverse dashboard code
amdomanska Jan 21, 2025
22aa207
reverse unnecessary changes
amdomanska Jan 21, 2025
79277ad
remove unnecessary code from dashboard js; add static url for flagged…
amdomanska Jan 21, 2025
ccb6693
add rule to the dashboard
amdomanska Jan 21, 2025
48a3238
clean up js in dashboard template
amdomanska Jan 21, 2025
029f7a1
remove unnecessary template
amdomanska Jan 21, 2025
74fea92
change disabled inputs on resolve on readonly to send data correctly
amdomanska Jan 21, 2025
1f4f4bf
add resolved flag field to shared structs
amdomanska Jan 21, 2025
5cb295f
fix far in the future function
amdomanska Jan 21, 2025
d713068
fix resolving flag; move transforming resolved flag from crosswalk to…
amdomanska Jan 21, 2025
6e14f61
display flagged to me todos
amdomanska Jan 21, 2025
aebad8c
remove na, ur and oh rules from flagged journals
amdomanska Jan 21, 2025
fed5d1a
fix rules display
amdomanska Jan 21, 2025
923ff13
introduce 2 rules for flagged todos
amdomanska Jan 21, 2025
4a01e3d
remove obsolete method
amdomanska Jan 22, 2025
faaed1d
remove obsolete import
amdomanska Jan 22, 2025
4ddf169
move resolved flag message to Messages module
amdomanska Jan 22, 2025
56cef2d
add rule that is too general
amdomanska Jan 22, 2025
da29295
dashboard sort draft
amdomanska Jan 23, 2025
1668eb3
remove confusing flag from the template
amdomanska Feb 3, 2025
555cca1
ensure deadline is displayed only for flagged items
amdomanska Feb 3, 2025
9f714d0
remove the link to flagged items from the dashboard
amdomanska Feb 3, 2025
dfb24af
fix unexpected ; exception in the base
amdomanska Feb 3, 2025
0f0c8ec
change the placement of the flag in the results
amdomanska Feb 3, 2025
40321b3
move short help to relevant input
amdomanska Feb 4, 2025
ce74b28
add functional test
amdomanska Feb 11, 2025
fb1ec3c
fix the rule priority and the query
amdomanska Feb 11, 2025
98f4ace
fix dashboard rules
amdomanska Feb 11, 2025
704d69e
fix flag form layout
amdomanska Feb 11, 2025
ea0cc10
add deadline validator
amdomanska Feb 11, 2025
0fc1dc2
add functional test
amdomanska Feb 12, 2025
790a582
remove prints
amdomanska Feb 12, 2025
9b8a589
add includes and includedIn params
amdomanska Feb 12, 2025
8303be3
add deadline info check
amdomanska Feb 12, 2025
9757b02
add filters to applications search
amdomanska Feb 12, 2025
c1d1fd3
add sort by deadline to applications search and filters to journals s…
amdomanska Feb 12, 2025
b3c473c
add flag filters to editor searches
amdomanska Feb 17, 2025
7ee60fd
add flagged query filter
amdomanska Feb 17, 2025
021c909
remove comment
amdomanska Feb 17, 2025
a204c5d
adjust functional tests
amdomanska Feb 17, 2025
06c289f
fix displaying disabled flags
amdomanska Feb 17, 2025
212041a
ensure proper flag placement
amdomanska Feb 17, 2025
9fa3c88
fix small issues in historical stats yml file
amdomanska Feb 17, 2025
d0f2cfa
fix functional tests
amdomanska Feb 17, 2025
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
Prev Previous commit
Next Next commit
hide newFlagGroup correctly
amdomanska committed Dec 4, 2024
commit 365e29149bd90a7bbfb4811b6b459174c5cdf644
2 changes: 1 addition & 1 deletion portality/static/js/formulaic.js
Original file line number Diff line number Diff line change
@@ -1250,7 +1250,7 @@ var formulaic = {
$("#" +this.fieldDef.name+ "-" + this.newFlagIdx + "-flag_setter").hide();
$("#" +this.fieldDef.name+ "-" + this.newFlagIdx + "-flag_created_date").hide();
$(this.flagGroups[this.newFlagIdx]).insertBefore(this.flagGroups[this.existingFlagIdx]);
$(this.flagGroups[this.newFlagIdx]).hide();
$(this.flagGroups[this.newFlagIdx]).parent().hide();
};

this.setUI = function() {