# HG changeset patch # User Magnus Schieder # Date 1516968934 -3600 # Node ID 45b7b83efaed70a07f005a67cc0cd58a01290e67 # Parent 50b00768575e90a802fa77cf446430f25c0320f9 Prepares for release 2.2. diff -r 50b00768575e -r 45b7b83efaed CHANGES --- a/CHANGES Mon Jan 22 08:14:34 2018 +0100 +++ b/CHANGES Fri Jan 26 13:15:34 2018 +0100 @@ -1,6 +1,10 @@ -2.x 20xx-xx-xx UNRELEASED +2.2 2018-01-26 -TODO + * The problem with unwanted multi moves and deletions is solved. + The multi-selection is deleted when switching from the entrie list to + project list. This avoids errors when moving or erasing. + More information can be found in /getan/doc/old_issues.txt -20180117 + Patch by Magnus Schieder * Improves 'move' operation to work in the current entry, if there is no selection. This is more consistent with 'delete'. Patch by Frank Koormann. diff -r 50b00768575e -r 45b7b83efaed README --- a/README Mon Jan 22 08:14:34 2018 +0100 +++ b/README Fri Jan 26 13:15:34 2018 +0100 @@ -193,6 +193,7 @@ Contributions ------------- +Magnus Schieder Frank Koormann Stephan Holl Tom Gottfried diff -r 50b00768575e -r 45b7b83efaed TODO --- a/TODO Mon Jan 22 08:14:34 2018 +0100 +++ b/TODO Fri Jan 26 13:15:34 2018 +0100 @@ -1,17 +1,5 @@ 20180117 Magnus Schieder - 20170317 BER: Reproduce and then fix a defect that it is surprising which - entries are moved by `m` or deleted by 'd'. - It probably has to do how multi-selection are handled. Maybe they - are not cleared properly at the end of an operation. - One description: It happens when you have changed a lot of entries - from different projects (I assume), e.g. by editing the description, - the length or timedate and then use move where you intend to only move - one, the unwanted result is several moved entries. - - reproduced with getan 2.1 - 20180118BER Reproduced with urwid v1.3.0, python3.4.6, getan 2.2.dev1 r445 - Creating a new database with test data: 1) Delete getan_test_data.db if it already exists to create a new database. @@ -27,37 +15,9 @@ 20180118BER: Observation: ent1 and ent2 are not highlighted anymore. - 6) Switch back to the entries of project pro1. - 7) Mark this time ent3 and ent4. - 8) Press m, then 3 and then y to move ent3 and ent4 to pro3. - - Expectation: - ent3 and ent4 are moved to pro3. - - Result: - ent1, ent2, ent3 and ent4 were moved to pro3. - -- Bug 1.1 - Execute 1) to 7) from 1.0. - 8) Press d to delete ent3 and ent4. - - Expectation: - ent3 and ent4 are deleted. - - Result: - ent1, en2, ent3 and ent4 are deleted. - -- Bug2 - Execute 1) to 4) from 1.0. - 5) Press m. - 6) Now also mark ent3 and pro ent4. - 7) Press 3 and then y to move ent1, ent2, ent3 and ent4 to pro3. - - Expectation: - After pressing m, you can not mark additional entries. - - Result: - Only ent1 and ent2 are moved, though all are selected. + 20180126 Magnus Schieder + The selection is deleted when switching to the projects. + So ent1 and ent2 should not highlighted anymore. 20180118 BER There should be an indication which entries are shown when being in the right pane. When you use tab to go to the entries, diff -r 50b00768575e -r 45b7b83efaed doc/old_issues.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/old_issues.txt Fri Jan 26 13:15:34 2018 +0100 @@ -0,0 +1,50 @@ +20180117 Magnus Schieder + + 20170317 BER: Reproduce and then fix a defect that it is surprising which + entries are moved by `m` or deleted by 'd'. + It probably has to do how multi-selection are handled. Maybe they + are not cleared properly at the end of an operation. + One description: It happens when you have changed a lot of entries + from different projects (I assume), e.g. by editing the description, + the length or timedate and then use move where you intend to only move + one, the unwanted result is several moved entries. + + reproduced with getan 2.1 + 20180118BER Reproduced with urwid v1.3.0, python3.4.6, getan 2.2.dev1 r445 + + Creating a new database with test data: + + 1) Delete getan_test_data.db if it already exists to create a new database. + 2) Execute getan_test_data.py to get the test database getan_test_data.db. + (getan/test_data/getan_test_data.py) + +- Bug 1.0 + 2) Open getan with the test database. (getan /path/getan_test_data.db) + 3) Switch to the entries from the project pro1 with tab. + 4) Mark with return and arrow keys ent1 and ent2. + 5) Go back to the projects with tab. + + 20180118BER: + Observation: ent1 and ent2 are not highlighted anymore. + + 6) Switch back to the entries of project pro1. + 7) Mark this time ent3 and ent4. + 8) Press m, then 3 and then y to move ent3 and ent4 to pro3. + + Expectation: + ent3 and ent4 are moved to pro3. + + Result: + ent1, ent2, ent3 and ent4 were moved to pro3. + +- Bug 1.1 + Execute 1) to 7) from 1.0. + 8) Press d to delete ent3 and ent4. + + Expectation: + ent3 and ent4 are deleted. + + Result: + ent1, en2, ent3 and ent4 are deleted. + + diff -r 50b00768575e -r 45b7b83efaed getan/__init__.py --- a/getan/__init__.py Mon Jan 22 08:14:34 2018 +0100 +++ b/getan/__init__.py Fri Jan 26 13:15:34 2018 +0100 @@ -6,5 +6,5 @@ # This is Free Software licensed under the terms of GPLv3 or later. # For details see LICENSE coming with the source of 'getan'. -__version_info__ = ("2", "2", "dev2") +__version_info__ = ("2", "2") __version__ = '.'.join(__version_info__) diff -r 50b00768575e -r 45b7b83efaed test_data/getan_test_data.py --- a/test_data/getan_test_data.py Mon Jan 22 08:14:34 2018 +0100 +++ b/test_data/getan_test_data.py Fri Jan 26 13:15:34 2018 +0100 @@ -1,15 +1,18 @@ #!/usr/bin/env python3 -# -# Author: Magnus Schieder -# (c) 2018 Intevation GmbH -# + # Program to create test data for getan (getan_test_data.db). -# Please delete existing getan_test_data.db. -# Open getan with getan_test_data.db: getan /path/getan_test_data.db -# -# This is Free Software licensed under the terms of GPLv3 or later. -# For details see LICENSE coming with the source of 'getan'. -# + +""" + Author: Magnus Schieder + (c) 2018 Intevation GmbH + + Please delete existing getan_test_data.db. + Execute getan_test_data.py to get the test database getan_test_data.db. + Open getan with getan_test_data.db: getan /path/getan_test_data.db + + This is Free Software licensed under the terms of GPLv3 or later. + For details see LICENSE coming with the source of 'getan'. +""" import sqlite3 @@ -68,6 +71,7 @@ conn.commit() conn.close() + print("getan_test_data.db was created.") if __name__ == '__main__': main()