Titusfixes - [merged]

[dezhidki]

In GitLab by @vivanauk on Jun 28, 2018, 15:09

Merges titusfixes -> master

Korjauksia ja lisäyksiä Titus-projektin lisäämiin toimintoihin, kuten TimTable-plugin ja liitteiden leimaus ja yhdistäminen.

[dezhidki]

In GitLab by @Smibu on Jun 29, 2018, 11:40

Tee rebase tälle kun ehdit; laitoin masteriin äsken uploadien oikeuspäivitykset. Tiedostossa upload.py on muutama konflikti.

[dezhidki]

In GitLab by @vivanauk on Jun 29, 2018, 12:13

added 12 commits

• 772a08ab...442dc3e9 - 4 commits from branch master
• c14b4ec6 - Change stamp data to use objects instead of dictionaries
• 12e2d475 - Update exception handling and comments to fit the previous change to stamp data objects
• 18aca1fa - Fix error messages and displaying AttachmentStampData as a string
• 454cb8af - Add list of found attachments and warning if invalid files were found
• c7886f33 - Move repeating code in merge routes to a function
• a6afb2e6 - Add support for column background and text color
• c26d8302 - Fix opening stamped pdf file
• 9242d52c - Fix error in None check and add comment about font families not working

Compare with previous version

[dezhidki]

In GitLab by @vivanauk on Jul 2, 2018, 10:25

added 14 commits

• 9242d52c...53b5216a - 6 commits from branch master
• 27f89956 - Change stamp data to use objects instead of dictionaries
• ca557e67 - Update exception handling and comments to fit the previous change to stamp data objects
• 4ea0c475 - Fix error messages and displaying AttachmentStampData as a string
• 1c813de7 - Add list of found attachments and warning if invalid files were found
• bf29e740 - Move repeating code in merge routes to a function
• c095ae1d - Add support for column background and text color
• 3e57569a - Fix opening stamped pdf file
• ab5fd55d - Fix error in None check and add comment about font families not working

Compare with previous version

[dezhidki]

In GitLab by @vivanauk on Jul 3, 2018, 11:59

added 26 commits

• ab5fd55d...1c6f4b2a - 18 commits from branch master
• 6024fde5 - Change stamp data to use objects instead of dictionaries
• 6a70579e - Update exception handling and comments to fit the previous change to stamp data objects
• 48375532 - Fix error messages and displaying AttachmentStampData as a string
• 31753baa - Add list of found attachments and warning if invalid files were found
• 8c479093 - Move repeating code in merge routes to a function
• 65e40f02 - Add support for column background and text color
• ac788613 - Fix opening stamped pdf file
• 916ff8cc - Fix error in None check and add comment about font families not working

Compare with previous version

[dezhidki]

In GitLab by @vivanauk on Jul 4, 2018, 09:09

added 1 commit

• 52d28511 - Add support for column width

Compare with previous version

[dezhidki]

In GitLab by @vivanauk on Jul 4, 2018, 09:41

added 12 commits

• 52d28511...7bcc8b6c - 3 commits from branch master
• bbeab086 - Change stamp data to use objects instead of dictionaries
• e82b9039 - Update exception handling and comments to fit the previous change to stamp data objects
• 50912348 - Fix error messages and displaying AttachmentStampData as a string
• 52b7425e - Add list of found attachments and warning if invalid files were found
• 3c70a8d7 - Move repeating code in merge routes to a function
• d4325174 - Add support for column background and text color
• 161b2ba5 - Fix opening stamped pdf file
• b5c43d68 - Fix error in None check and add comment about font families not working
• b6743cf1 - Add support for column width

Compare with previous version

[dezhidki]

In GitLab by @vivanauk on Jul 5, 2018, 10:12

added 22 commits

• b6743cf1...bcf88bb0 - 13 commits from branch master
• f067bd9f - Change stamp data to use objects instead of dictionaries
• 9f783939 - Update exception handling and comments to fit the previous change to stamp data objects
• a2fd031f - Fix error messages and displaying AttachmentStampData as a string
• cba82a56 - Add list of found attachments and warning if invalid files were found
• de2339eb - Move repeating code in merge routes to a function
• 2c64c8f2 - Add support for column background and text color
• a8705377 - Fix opening stamped pdf file
• 754037dc - Fix error in None check and add comment about font families not working
• 00d58ecd - Add support for column width

Compare with previous version

[dezhidki]

In GitLab by @vivanauk on Jul 5, 2018, 10:19

added 2 commits

• 1de29855 - Add missing session commit
• f4441ee3 - Move uploaded file string back to class properties because parEditor.html uses it

Compare with previous version

[dezhidki]

In GitLab by @vivanauk on Jul 5, 2018, 10:33

added 1 commit

• 9ac425b8 - Update comments

Compare with previous version

[dezhidki]

In GitLab by @vivanauk on Jul 5, 2018, 10:47

added 1 commit

• 1f7c6f85 - Add using default value if a None value falls through to cell constructor

Compare with previous version

[dezhidki]

In GitLab by @Smibu on Jul 5, 2018, 10:57

Commented on timApp/document/minutes/routes.py line 209

Sulkuja ei tarvitse tässä. Pari muutakin vastaavaa kohtaa on.

[dezhidki]

In GitLab by @Smibu on Jul 5, 2018, 11:01

Commented on timApp/plugin/timtable/timTableLatex.py line 219

Tähän tullaan Nonen lisäksi myös, jos value on tyhjä merkkijono tai tyhjä kokoelma ylipäänsä. Voi olla tarkoituskin, mutta kommenttia kannattaa ainakin tarkentaa.

[dezhidki]

In GitLab by @Smibu on Jul 5, 2018, 11:09

Commented on timApp/util/pdftools.py line 216

Typo attachmnet

[dezhidki]

In GitLab by @Smibu on Jul 5, 2018, 11:20

Commented on timApp/util/pdftools.py line 527

Tämä for-silmukan sisältö voisi olla AttachmentStampData-luokan validate-metodi. Tuo isinstance-tarkistus on parametrin tyypin perusteella tarpeeton.

[dezhidki]

In GitLab by @Smibu on Jul 5, 2018, 11:28

Commented on timApp/static/scripts/tim/document/minutes/mergePdfCtrl.ts line 125

attachment -> attachments?

[dezhidki]

In GitLab by @vivanauk on Jul 5, 2018, 11:48

Commented on timApp/util/pdftools.py line 216

changed this line in version 11 of the diff

[dezhidki]

In GitLab by @vivanauk on Jul 5, 2018, 11:48

Commented on timApp/util/pdftools.py line 527

changed this line in version 11 of the diff

[dezhidki]

In GitLab by @vivanauk on Jul 5, 2018, 11:48

added 1 commit

• 3e64cadc - Move code validating stamp data objects to a method

Compare with previous version

[dezhidki]

In GitLab by @vivanauk on Jul 5, 2018, 12:06

Commented on timApp/document/minutes/routes.py line 209

Itse tykkään käyttää niitä selkeyttämään kun kyseessä on tuple. Näissä tapauksissa palautuneita arvoja ei tosin käytetä tupleina, joten siltä osin turhat ovat.

[dezhidki]

In GitLab by @vivanauk on Jul 5, 2018, 12:17

Commented on timApp/document/minutes/routes.py line 209

changed this line in version 12 of the diff

[dezhidki]

In GitLab by @vivanauk on Jul 5, 2018, 12:17

Commented on timApp/static/scripts/tim/document/minutes/mergePdfCtrl.ts line 125

changed this line in version 12 of the diff

[dezhidki]

In GitLab by @vivanauk on Jul 5, 2018, 12:17

added 2 commits

• a06b9deb - Change none value check to ignore other empty values
• 29890ed4 - Refactor code

Compare with previous version

[dezhidki]

In GitLab by @vivanauk on Jul 5, 2018, 12:18

resolved all discussions

[dezhidki]

In GitLab by @Smibu on Jul 5, 2018, 12:36

unmarked as a Work In Progress

[dezhidki]

In GitLab by @Smibu on Jul 5, 2018, 12:36

approved this merge request

[dezhidki]

In GitLab by @Smibu on Jul 5, 2018, 12:36

merged

[dezhidki]

In GitLab by @Smibu on Jul 5, 2018, 12:40

Mergesin. @vivanauk Voit laittaa tuotantoon.