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.

Sign up for GitHub

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

Jump to bottom

Inheritance changes - icarEventCoreResource, icarIdentifierType #24

Merged
merged 12 commits into from
Jun 21, 2019
Merged

Inheritance changes - icarEventCoreResource, icarIdentifierType #24

merged 12 commits into from
Jun 21, 2019

Commits on Jun 19, 2019

  1. Create icarEventCoreResource 

    Modelling the event core as a base class so that specific event instances can incorporate these fields by reference using "allOf".
    @cookeac
    cookeac authored Jun 19, 2019
    Configuration menu
    Copy the full SHA
    ac31c58 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from adewg/master 

    Merge from head to branch
    @cookeac
    cookeac authored Jun 19, 2019
    Configuration menu
    Copy the full SHA
    c374ef0 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2019

  1. Update icarEventCoreResource 

    I'm thinking that rather than have an icarAnimalIdentifierType and icarLocationIdentifierType and icarHerdIdentifierType and icarMilkVatIdentifierType and ... maybe we should just have icarIdentifierType as all these will now have a scheme and identity.
    @cookeac
    cookeac authored Jun 20, 2019
    Configuration menu
    Copy the full SHA
    765ea21 View commit details
    Browse the repository at this point in the history

  2. Create icarIdentifierType.json 

    Created a generic type for identifiers that comprise and id and scheme. This could replace use of icarAnimalIdentificationType if desired.
    @cookeac
    cookeac authored Jun 20, 2019
    Configuration menu
    Copy the full SHA
    491ebb5 View commit details
    Browse the repository at this point in the history

  3. Delete ICARMilkSample.json 

    Removed - I think this is already removed in the master.
    @cookeac
    cookeac authored Jun 20, 2019
    Configuration menu
    Copy the full SHA
    e87af13 View commit details
    Browse the repository at this point in the history

  4. Delete JoinDataMilkSample.json 

    Removed - I think this is already removed in the master.
    @cookeac
    cookeac authored Jun 20, 2019
    Configuration menu
    Copy the full SHA
    be2cd7c View commit details
    Browse the repository at this point in the history

  5. Update icarIdentifierType.json 

    Corrected typo. Discussed generic vs specific identifiers with Arjan.
    @cookeac
    cookeac authored Jun 20, 2019
    Configuration menu
    Copy the full SHA
    b3287c0 View commit details
    Browse the repository at this point in the history

  6. Rename icarEventCoreResource to icarEventCoreResource.json 

    Corrected typo in file name
    @cookeac
    cookeac authored Jun 20, 2019
    Configuration menu
    Copy the full SHA
    a5daff2 View commit details
    Browse the repository at this point in the history

  7. inherit from icarIdentifierType

    @cookeac
    cookeac authored Jun 20, 2019
    Configuration menu
    Copy the full SHA
    5045154 View commit details
    Browse the repository at this point in the history

  8. Create icarLocationIdentifierType.json

    @cookeac
    cookeac authored Jun 20, 2019
    Configuration menu
    Copy the full SHA
    651d66c View commit details
    Browse the repository at this point in the history

  9. Update icarEventCoreResource.json 

    Added missing comma
    @cookeac
    cookeac authored Jun 20, 2019
    Configuration menu
    Copy the full SHA
    7b55d4f View commit details
    Browse the repository at this point in the history

  10. Inherit from icarEventCoreResource

    @cookeac
    cookeac authored Jun 20, 2019
    Configuration menu
    Copy the full SHA
    4f78e66 View commit details
    Browse the repository at this point in the history