-
Notifications
You must be signed in to change notification settings - Fork 236
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
Conversation
This is still a WIP, I would like some help with that Build Failure I also got locally |
Did you ask for help on talk? |
@ODORA0 have you seen the merge conflicts ?? |
@@ -52,6 +57,12 @@ | |||
@ConfigurationProperty | |||
private TimePeriod repeatPerTimePeriod; | |||
|
|||
@ConfigurationProperty | |||
private DatasetDefinition endDate; |
There was a problem hiding this comment.
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??
There was a problem hiding this comment.
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; |
There was a problem hiding this comment.
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??
There was a problem hiding this comment.
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; |
There was a problem hiding this comment.
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
I don't thnk I have merge conflicts because my branch has been upto date, i performed a |
@ODORA0 true , you have no merge comflicts , i was just mistaken |
I actually had the similar issue |
@ODORA0 did you see the above comments? |
Oh yes! Am working on that |
@ODORA0 can you include the ticket id in the commit message? |
Made a new PR here #193, mistakenly deleted this commit on my vim |
…ePeriodDataSetDefinition
Issue worked on: https://issues.openmrs.org/browse/REPORT-635