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

feat: add new field type for date and time picker combined #1901

Merged

Conversation

squigglybob
Copy link
Collaborator

resolves #1895

@squigglybob squigglybob marked this pull request as draft December 20, 2022 14:48
@corsacca
Copy link
Member

@squigglybob is this still in draft mode?

@squigglybob
Copy link
Collaborator Author

yars, I think so. I can't remember why I didn't finish it, but it could probably use some double brains on it to work out the best way forward and what is necessary.

I was working on it, so that the PG laps, would be able to see/change the start time of a lap, but then it dropped lower in priority and I forgot to come back to it I think.

@squigglybob squigglybob marked this pull request as ready for review May 9, 2023 15:23
@squigglybob squigglybob requested a review from corsacca May 9, 2023 15:23
@squigglybob
Copy link
Collaborator Author

hey @corsacca finally got this one going 😀

@squigglybob
Copy link
Collaborator Author

hahaha, I thought I was done, but then we decided to split date field with optional time picker into
date field
and
datetime field

Let's split these babies up!!!

@squigglybob
Copy link
Collaborator Author

@zdmc23 There has been a new field type in the process of being added, so you're aware of it from the mobile side of things

@squigglybob
Copy link
Collaborator Author

squigglybob commented May 10, 2023

Still todo

  • add docs for the datetime field type
  • display time with the date in the activity log
  • add tests for the datetime field type
  • test with private fields
  • test with time travel roll back

@squigglybob squigglybob changed the title feat: add time picker field option and show in front end feat: add new fieldtype for date and time picker combined May 10, 2023
@squigglybob squigglybob changed the title feat: add new fieldtype for date and time picker combined feat: add new field type for date and time picker combined May 10, 2023
@squigglybob
Copy link
Collaborator Author

Hey @corsacca,

This one is done and tested in the unit tests, and checked with record time travel.

I noticed that the curly brackets are being left around the timestamps in the record.

Is that intentional? Shall I create a new ticket to deal with that or do it in here?

@squigglybob
Copy link
Collaborator Author

I removed them 😆
It should'nt affect any situations where there aren't any brackets either, so should be ok

# Conflicts:
#	dt-assets/js/comments.js
#	dt-assets/js/modular-list.js
#	dt-assets/js/record-history.js
@corsacca corsacca changed the base branch from master to develop August 18, 2023 15:34
@corsacca corsacca merged commit 6b90e01 into DiscipleTools:develop Aug 18, 2023
2 checks passed
@corsacca
Copy link
Member

thanks @squigglybob !

@squigglybob squigglybob deleted the feat/add-time-picker-to-date-field branch September 5, 2023 12:04
@squigglybob
Copy link
Collaborator Author

woop, that was a long time in the coming 😉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Date Time field type
2 participants