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

Fix job minutes in dates #6519

Merged
merged 2 commits into from
Jul 20, 2023
Merged

Fix job minutes in dates #6519

merged 2 commits into from
Jul 20, 2023

Conversation

zhiltsov-max
Copy link
Contributor

Motivation and context

Fixes #6508

https://momentjscom.readthedocs.io/en/latest/moment/04-displaying/01-format/

  • Fixed invalid format token for minutes in job-item dates

How has this been tested?

Checklist

  • I submit my changes into the develop branch
  • I have added a description of my changes into the CHANGELOG file
  • I have updated the documentation accordingly
  • I have added tests to cover my changes
  • I have linked related issues (see GitHub docs)
  • I have increased versions of npm packages if it is necessary
    (cvat-canvas,
    cvat-core,
    cvat-data and
    cvat-ui)

License

  • I submit my code changes under the same MIT License that covers the project.
    Feel free to contact the maintainers if that's a concern.

@codecov
Copy link

codecov bot commented Jul 19, 2023

Codecov Report

Merging #6519 (f7dba21) into develop (783c414) will increase coverage by 0.02%.
The diff coverage is 77.77%.

@@             Coverage Diff             @@
##           develop    #6519      +/-   ##
===========================================
+ Coverage    81.69%   81.71%   +0.02%     
===========================================
  Files          337      337              
  Lines        38496    38512      +16     
  Branches      3540     3545       +5     
===========================================
+ Hits         31449    31471      +22     
+ Misses        7047     7041       -6     
Components Coverage Δ
cvat-ui 75.12% <77.77%> (+0.04%) ⬆️
cvat-server 87.82% <ø> (+<0.01%) ⬆️

Copy link
Contributor

@sizov-kirill sizov-kirill left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested this, the problem seems to be fixed.

@bsekachev bsekachev merged commit c230395 into develop Jul 20, 2023
@bsekachev bsekachev deleted the zm/fix-job-dates branch July 20, 2023 10:08
mikhail-treskin pushed a commit to retailnext/cvat that referenced this pull request Oct 25, 2023
<!-- Raise an issue to propose your change
(https://github.com/opencv/cvat/issues).
It helps to avoid duplication of efforts from multiple independent
contributors.
Discuss your ideas with maintainers to be sure that changes will be
approved and merged.
Read the [Contribution
guide](https://opencv.github.io/cvat/docs/contributing/). -->

<!-- Provide a general summary of your changes in the Title above -->

### Motivation and context
<!-- Why is this change required? What problem does it solve? If it
fixes an open
issue, please link to the issue here. Describe your changes in detail,
add
screenshots. -->

Fixes cvat-ai#6508


https://momentjscom.readthedocs.io/en/latest/moment/04-displaying/01-format/

- Fixed invalid format token for minutes in job-item dates

### How has this been tested?
<!-- Please describe in detail how you tested your changes.
Include details of your testing environment, and the tests you ran to
see how your change affects other areas of the code, etc. -->

### Checklist
<!-- Go over all the following points, and put an `x` in all the boxes
that apply.
If an item isn't applicable for some reason, then ~~explicitly
strikethrough~~ the whole
line. If you don't do that, GitHub will show incorrect progress for the
pull request.
If you're unsure about any of these, don't hesitate to ask. We're here
to help! -->
- [ ] I submit my changes into the `develop` branch
- [ ] I have added a description of my changes into the
[CHANGELOG](https://github.com/opencv/cvat/blob/develop/CHANGELOG.md)
file
- [ ] I have updated the documentation accordingly
- [ ] I have added tests to cover my changes
- [ ] I have linked related issues (see [GitHub docs](

https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))
- [ ] I have increased versions of npm packages if it is necessary

([cvat-canvas](https://github.com/opencv/cvat/tree/develop/cvat-canvas#versioning),

[cvat-core](https://github.com/opencv/cvat/tree/develop/cvat-core#versioning),

[cvat-data](https://github.com/opencv/cvat/tree/develop/cvat-data#versioning)
and

[cvat-ui](https://github.com/opencv/cvat/tree/develop/cvat-ui#versioning))

### License

- [ ] I submit _my code changes_ under the same [MIT License](
https://github.com/opencv/cvat/blob/develop/LICENSE) that covers the
project.
  Feel free to contact the maintainers if that's a concern.
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.

Incorrect created on value for jobs
3 participants