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

REPORT-635: Add startDate and endDate as configuration properties on RepeatPerTim… #188

Closed
wants to merge 0 commits into from

Conversation

ODORA0
Copy link
Member

@ODORA0 ODORA0 commented Nov 5, 2019

…ePeriodDataSetDefinition

Issue worked on: https://issues.openmrs.org/browse/REPORT-635

@ODORA0
Copy link
Member Author

ODORA0 commented Nov 5, 2019

This is still a WIP, I would like some help with that Build Failure I also got locally

@dkayiwa
Copy link
Member

dkayiwa commented Nov 5, 2019

Did you ask for help on talk?

@mozzy11
Copy link
Member

mozzy11 commented Nov 5, 2019

@ODORA0 have you seen the merge conflicts ??
have you looked at this https://wiki.openmrs.org/display/docs/Using+Git

@@ -52,6 +57,12 @@
@ConfigurationProperty
private TimePeriod repeatPerTimePeriod;

@ConfigurationProperty
private DatasetDefinition endDate;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why would you create a date object from DatasetDefinition Classs??

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mozzy11 is correct, the startDate and endDate should be Date objects

private DatasetDefinition endDate;

@ConfigurationProperty
private DataSetDefinition startDate;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why would you create a date object from DatasetDefinition Classs??

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought using the class there would make sense given that endDate and startDate are set as configuration properties of DataSetDefinition. How would I go about that then

}

public void setEndDate(DataSetDefinition endDate){
this.endDate = endDate;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check this error Here

incompatible types: org.openmrs.reporting.data.DatasetDefinition cannot be converted to org.openmrs.module.reporting.dataset.definition.DataSetDefinition.

You have two different classes but same names .
Youll need to explicitly define which class you need with a fully qualified path

@ODORA0
Copy link
Member Author

ODORA0 commented Nov 5, 2019

I don't thnk I have merge conflicts because my branch has been upto date, i performed a git pull --rebase upstream master before working on this

@mozzy11
Copy link
Member

mozzy11 commented Nov 5, 2019

@ODORA0 true , you have no merge comflicts , i was just mistaken

@mozzy11
Copy link
Member

mozzy11 commented Nov 5, 2019

@sherrif10
Copy link
Member

I actually had the similar issue

@dkayiwa
Copy link
Member

dkayiwa commented Nov 29, 2019

@ODORA0 did you see the above comments?

@ODORA0
Copy link
Member Author

ODORA0 commented Nov 29, 2019

Oh yes! Am working on that

@dkayiwa
Copy link
Member

dkayiwa commented Dec 10, 2019

@ODORA0 can you include the ticket id in the commit message?

@ODORA0
Copy link
Member Author

ODORA0 commented Dec 12, 2019

Made a new PR here #193, mistakenly deleted this commit on my vim

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants