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.

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

Jump to bottom

Dev 1.3. #149

Merged
merged 56 commits into from
Jan 5, 2025
Merged

Dev 1.3. #149

merged 56 commits into from
Jan 5, 2025

Conversation

hlageek
Copy link
Contributor

@hlageek hlageek commented Jan 4, 2025

A bundle of backend/frontend changes and refactoring.
Main point:

  • displayed segments are now calculated for each

    so that we actually generate valid html for tags (closing them within the encompassing paragraph)

  • new css styles and classes
  • new system observers for annotation screen
  • toggle for highlight/underline
  • toggle for two-column display of codes
  • incorporated small JS library for draggable column width in annotation screen
  • Quick Tag function using iframe setup for annotation screen plus necessary JS functions
  • code editing functionality
  • click on document name in analysis screen takes users to annotation screen with corresponding document
  • fixes refresh codes in coding screen #130

hlageek and others added 30 commits February 21, 2022 11:29
@hlageek
underline prework
7687af8
@hlageek
ui prework
8ef6f6d
@hlageek
add default
e01411a
@hlageek
progress with parsing refi
8f8a392
@hlageek
recoding codes hierarchy
cf95a07
@hlageek
writinh sources to db
759d56f
@hlageek
show long code names
86275aa
@hlageek
Merge branch 'main' into import
42ccb7f
@hlageek
test
40fdbe3
@hlageek
div attempts
bb3c8d2
@hlageek
working columns resize
064d3c9
@hlageek
restrict to qdpx for now
c18ca8e
@hlageek
underline switcher
11a1632
@hlageek
not working
6dfdfde
@hlageek
kinda
7c924a3
@hlageek
works!
be97277
@hlageek
can code one char
d8d291f
@hlageek
deleting modals
b3c87f7
@hlageek
highlights flicker fix
120166c
@hlageek
Merge branch 'import-dev' into import
4f1f230
@hlageek
fixes #130
6f101b4
@hlageek
reset values of texts and code tools on project change
c9c382c
@hlageek
separate js scripts
9674afe
@hlageek
style text selection
3796654
@hlageek
sorta works
bde3931
@hlageek
styling for quickcode
51bb55b
@hlageek
implemented quickcode + refactor
078de4e 
plus some streamlined reactivity for document coding and codebook; new function to write quickcodes to DB
@hlageek
change scroll on codes
274ddb0
@hlageek
Update mod_about.R
f8947b9
@hlageek
Merge branch 'main' into import
1bc14f3
hlageek added 21 commits May 3, 2024 19:41
@hlageek
Merge branch 'dev' into import
c49944d
@hlageek
change requal capitalization
f8cc21e
@hlageek
linking into documents from analysis
cccb67a
@hlageek
linking into documents from analysis, 2column codes
f61c4d2
@hlageek
Update custom.css
b0d40bd
@hlageek
wip
eac7bd7
@hlageek
Merge branch 'main' into import
82ea008
@hlageek
Fix css for custom logout btn
1c66029 
Due to shinymanager handling of logout buttons, we have two elements with the same id, so I had to add a class specification to keep the default hidden but display the custom
@hlageek
Merge branch 'import-quickcode' into dev
ab973f3
@hlageek
Merge branch 'scroll-into-text' into dev
daa178b
@hlageek
Update run_dev.R
57d7171
@hlageek
Merge branch 'import' into dev
e6c0b93
@hlageek
hide import
936e7b7
@hlageek
fix sql for quickcode
e6f92bc
@hlageek
no multiples for code deletion
a1bb867
@hlageek
implemented code edit
bbffdbf
@hlageek
bump version
0f45d13
@hlageek
require text selection for quicktag
28eeaac
@hlageek
add empty condition to quicktag
373f601
@hlageek
remove inconsistent condition from quicktag
403eefd
@hlageek
Merge branch 'main' into dev
c8b78ec
@hlageek hlageek requested a review from skvrnami January 4, 2025 16:12
@hlageek
Copy link
Contributor Author

hlageek commented Jan 4, 2025

Ooops, lots of failing checks 😰 Most seem to be from the work-in-progress functions for refi-qda import.

hlageek and others added 3 commits January 5, 2025 12:32
@hlageek
fix segments to document link fail
e9bbc9b 
when user tries to click on document link in Analyze screen before Annotation screen has a previously open document, the app fails. Added a condition to use internal code ID if it is unavailable from document selector.
@hlageek
remove refi import + some fixes to failing checks
7d24439
@skvrnami
Fix import-related note and add a test
c76a8e3
@hlageek hlageek merged commit 609371f into main Jan 5, 2025
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@skvrnami skvrnami skvrnami approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

refresh codes in coding screen creating new code on annotation screen code editing
2 participants
@hlageek @skvrnami