tbabej/taskwiki
1
0
Fork 0
mirror of https://github.com/tbabej/taskwiki.git synced 2025-08-19 06:43:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

VimwikiTask: Omit 00:00 time from due date

Browse source
This commit is contained in:
Bodo Graumann 2017-01-27 11:49:18 +01:00 • committed by Tomas Babej
parent 323f7e79e2
commit 32a1c45685
3 changed files with 35 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

7
taskwiki/vwtask.py
View file

@ -316,6 +316,11 @@ class VimwikiTask(object):
self._buffer_data = buffer_data self._buffer_data = buffer_data
def __str__(self): def __str__(self):
due_str = ' ' + (
self['due'].strftime(regexp.DATETIME_FORMAT) if self['due'].time() else
self['due'].strftime(regexp.DATE_FORMAT)
) if self['due'] else ''
return ''.join([ return ''.join([
self['indent'], self['indent'],
'* [', '* [',
@ -324,7 +329,7 @@ class VimwikiTask(object):
(self['description'].encode('utf-8') if six.PY2 else self['description']) (self['description'].encode('utf-8') if six.PY2 else self['description'])
if self['description'] else 'TEXT MISSING?', if self['description'] else 'TEXT MISSING?',
' ' + '!' * self.priority_from_tw_format if self['priority'] else '', ' ' + '!' * self.priority_from_tw_format if self['priority'] else '',
' ' + self['due'].strftime(regexp.DATETIME_FORMAT) if self['due'] else '', due_str,
' #' + self.uuid.vim_representation(self.cache) if self.uuid else '', ' #' + self.uuid.vim_representation(self.cache) if self.uuid else '',
]) ])

56
tests/test_viewport.py
View file

@ -386,13 +386,13 @@ class TestViewportsSortedGeneration(IntegrationTest):
vimoutput = """ vimoutput = """
=== Work tasks | +work === === Work tasks | +work ===
* [ ] main task 1 (2015-08-07 00:00) #{uuid} * [ ] main task 1 (2015-08-07) #{uuid}
* [ ] sub task 1a (2015-08-01 00:00) #{uuid} * [ ] sub task 1a (2015-08-01) #{uuid}
* [ ] sub task 1aa #{uuid} * [ ] sub task 1aa #{uuid}
* [ ] sub task 1b #{uuid} * [ ] sub task 1b #{uuid}
* [ ] main task 2 (2015-08-08 00:00) #{uuid} * [ ] main task 2 (2015-08-08) #{uuid}
* [ ] main task 3 (2015-08-09 00:00) #{uuid} * [ ] main task 3 (2015-08-09) #{uuid}
* [ ] sub task 3a (2015-08-03 00:00) #{uuid} * [ ] sub task 3a (2015-08-03) #{uuid}
* [ ] sub task 3b #{uuid} * [ ] sub task 3b #{uuid}
* [ ] main task 4 #{uuid} * [ ] main task 4 #{uuid}
""" """
@ -427,12 +427,12 @@ class TestViewportsSortedGenerationReverse(TestViewportsSortedGeneration):
vimoutput = """ vimoutput = """
=== Work tasks | +work === === Work tasks | +work ===
* [ ] main task 3 (2015-08-09 00:00) #{uuid} * [ ] main task 3 (2015-08-09) #{uuid}
* [ ] sub task 3a (2015-08-03 00:00) #{uuid} * [ ] sub task 3a (2015-08-03) #{uuid}
* [ ] sub task 3b #{uuid} * [ ] sub task 3b #{uuid}
* [ ] main task 2 (2015-08-08 00:00) #{uuid} * [ ] main task 2 (2015-08-08) #{uuid}
* [ ] main task 1 (2015-08-07 00:00) #{uuid} * [ ] main task 1 (2015-08-07) #{uuid}
* [ ] sub task 1a (2015-08-01 00:00) #{uuid} * [ ] sub task 1a (2015-08-01) #{uuid}
* [ ] sub task 1aa #{uuid} * [ ] sub task 1aa #{uuid}
* [ ] sub task 1b #{uuid} * [ ] sub task 1b #{uuid}
* [ ] main task 4 #{uuid} * [ ] main task 4 #{uuid}
@ -454,12 +454,12 @@ class TestViewportsMultilevelSortedGeneration(IntegrationTest):
vimoutput = """ vimoutput = """
=== Work tasks | project:Work or project:Home === === Work tasks | project:Work or project:Home ===
* [ ] home task 1 (2015-08-01 00:00) #{uuid} * [ ] home task 1 (2015-08-01) #{uuid}
* [ ] home task 2 (2015-08-02 00:00) #{uuid} * [ ] home task 2 (2015-08-02) #{uuid}
* [ ] home task 3 (2015-08-03 00:00) #{uuid} * [ ] home task 3 (2015-08-03) #{uuid}
* [ ] work task 1 (2015-08-01 00:00) #{uuid} * [ ] work task 1 (2015-08-01) #{uuid}
* [ ] work task 2 (2015-08-02 00:00) #{uuid} * [ ] work task 2 (2015-08-02) #{uuid}
* [ ] work task 3 (2015-08-03 00:00) #{uuid} * [ ] work task 3 (2015-08-03) #{uuid}
""" """
tasks = [ tasks = [
@ -487,10 +487,10 @@ class TestViewportsSpecificSorting(IntegrationTest):
vimoutput = """ vimoutput = """
=== Work tasks | project:Work or project:Home $T === === Work tasks | project:Work or project:Home $T ===
* [ ] home task 1 (2015-08-01 00:00) #{uuid} * [ ] home task 1 (2015-08-01) #{uuid}
* [ ] home task 2 (2015-08-02 00:00) #{uuid} * [ ] home task 2 (2015-08-02) #{uuid}
* [ ] work task 1 (2015-08-01 00:00) #{uuid} * [ ] work task 1 (2015-08-01) #{uuid}
* [ ] work task 2 (2015-08-02 00:00) #{uuid} * [ ] work task 2 (2015-08-02) #{uuid}
""" """
tasks = [ tasks = [
@ -518,16 +518,16 @@ class TestViewportsSpecificSortingCombined(TestViewportsSpecificSorting):
vimoutput = """ vimoutput = """
=== Work tasks | project:Work or project:Home $T === === Work tasks | project:Work or project:Home $T ===
* [ ] home task 1 (2015-08-01 00:00) #{uuid} * [ ] home task 1 (2015-08-01) #{uuid}
* [ ] home task 2 (2015-08-02 00:00) #{uuid} * [ ] home task 2 (2015-08-02) #{uuid}
* [ ] work task 1 (2015-08-01 00:00) #{uuid} * [ ] work task 1 (2015-08-01) #{uuid}
* [ ] work task 2 (2015-08-02 00:00) #{uuid} * [ ] work task 2 (2015-08-02) #{uuid}
=== Work tasks | project:Work or project:Home === === Work tasks | project:Work or project:Home ===
* [ ] home task 1 (2015-08-01 00:00) #{uuid} * [ ] home task 1 (2015-08-01) #{uuid}
* [ ] work task 1 (2015-08-01 00:00) #{uuid} * [ ] work task 1 (2015-08-01) #{uuid}
* [ ] home task 2 (2015-08-02 00:00) #{uuid} * [ ] home task 2 (2015-08-02) #{uuid}
* [ ] work task 2 (2015-08-02 00:00) #{uuid} * [ ] work task 2 (2015-08-02) #{uuid}
""" """

2
tests/test_vwtask.py
View file

@ -324,7 +324,7 @@ class TestSimpleTaskWithDueDateCreation(IntegrationTest):
""" """
vimoutput = """ vimoutput = """
* [ ] This is a test task (2015-03-03 00:00) #{uuid} * [ ] This is a test task (2015-03-03) #{uuid}
""" """
def execute(self): def execute(self):