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

ID Server seeding function, flushed storage, utf-8 encoding, etc. #386

Merged
merged 7 commits into from
Nov 19, 2017

Conversation

mikejmets and others added 7 commits November 19, 2017 22:10
* Added KeyError trap on GenerateUniqueId to provide more detail

* Allow year in all portal types in ID Server config

* Included a test for batch id with a year in it in IDServer

* Improved ID Format description

* Normalise new ID to exclude funny characters

* Used normalise_filename because normalise_id does a lower()

* Added portal type to number generator

* Added seed setting browser view

* Reformated IDFormattingField description

* Added validation to seed function

* Refactored generateUniqueId to use cleaner sub function

* Refactored set_seed to set_number

* Removed duplicate line of code

* Added try/finally around set_number

* Added validation to splitSliceJoin and doc tests

* Fixed splitSpliceJion validation; added CopyError catch in
renameAfterCreation

* Add added normalize to number_generator key
Added seed function to IDServer test

* In idserver, use DateSampled instead of SamplingDate for Sample IDs

* new_seq might be referenced before assignment

* Some formatting and PEP8

* Some formatting and PEP8

* PEP8 only

* Handle alredy taken IDs

* Handle nonexisting SampleDate gracefully

* Refactored ID server so both DateSampled and SamplingDate to be variables in the Sample ID

* Removed unused import

Conflicts:
	bika/lims/browser/configure.zcml
	bika/lims/content/bikasetup.py
	bika/lims/docs/ContactUser.rst
	bika/lims/docs/IDServer.rst
	bika/lims/idserver.py
senaite#2311)

* WIP: Fix ID Server to handle a flushed storage or existing IDs with the same Prefix

* refactored code

* Make tests work again

* remove all manual counter corrections

* Added flush route to Number Generator view

* Added some code and comments for future improvements

Conflicts:
	bika/lims/idserver.py
	bika/lims/numbergenerator.py
@xispa xispa merged commit 23b5bae into senaite:senaite-integration Nov 19, 2017
@xispa xispa deleted the idserver-last branch November 27, 2017 18:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants