Released requisition v7.0.0

Changed requisition version to 7.0.0-SNAPSHOT

Changed requisition version to RC3 for uat, uat3 and uat4

Release requisition v7.0.0-RC3

Changed Version to 7.0.0-SNAPSHOT

Changed Version to 7.0.0-RC2

Changed Version to 7.0.0-SNAPSHOT

Changed requisition version to 7.0.0-RC1 in uat, uat3 and uat4 envs.

Update release version to v7.0.0-RC1

Created a ticket for this. OLMIS-5085

Created a ticket for this. OLMIS-5085

OLMIS-4966: updated documentation of function that calculates adjusted consumption

Thanks! I have struggled with this section of the documentation a bit. Is this somehow generated into a javadoc? updating it as follows: /** * Calculates Adjusted Consumption (N) value and retur...

Thanks!
I have struggled with this section of the documentation a bit. Is this somehow generated into a javadoc?
updating it as follows:

/**
   * Calculates Adjusted Consumption (N) value and returns it.
   * - When additionalQuantityRequired field is not in template,
   * The formula used is N = RoundUp(C * ((M * 30) / ((M * 30) - X)))
   * If non-stockout days is zero the formula is N = C
   * - When additionalQuantityRequired column is present in the template,
   * The formula used is N = (RoundUp(C * ((M * 30) / ((M * 30) - X))) + additionalQuantityRequired)
   * C = Total Consumed Quantity
   * M = Months in the period (integer)
   * N = Adjusted Consumption
   * X = Total Stockout Days
   */


If javadoc is going to be generated, I may be able to use <p> tags and spacing the different conditions may make them appear better. does the following seem better?

 /**
   * Calculates Adjusted Consumption (N) value and returns it.
   * <p>
   *   The calculations used can be different depending on the visibility of
   *   Additional Quantity Required column.
   * </p>
   * 
   * <p>
   *   When additionalQuantityRequired field is not in template,
   *   The formula used is N = RoundUp(C * ((M * 30) / ((M * 30) - X)))
   *   If non-stockout days is zero the formula is N = C
   * </p>
   * 
   * <p>
   *   When additionalQuantityRequired column is present in the template,
   *   The formula used is N = (RoundUp(C * ((M * 30) / ((M * 30) - X))) + Z)
   *   If non-stockout days is zero the formula is N = C + Z
   * </p>
   * 
   * <p>
   *   C = Total Consumed Quantity
   *   M = Months in the period (integer)
   *   N = Adjusted Consumption
   *   X = Total Stockout Days
   *   Z = Additional Quantity Required
   * </p>
   */
OLMIS-4966: remove unessary check of isDisplayed. inverse if statement to remove operator.

Yes, there is a message for this key. This is a key that I reused from other validations.

Yes, there is a message for this key. This is a key that I reused from other validations.

OLMIS-4966: added tests that cover two conditions.

OLMIS-4966: Added additional column on requisition template.
OLMIS-4966: Added additional column on requisition template.
OLMIS-4966: Added additional column on requisition template.

Validate the requisition template to make sure that the additionalQuantityRequired field

is only enabled when adjsted consumption column is also visible.

Calculate adjusted consumption when additional quantity required is changed.

OLMIS-4966: Add additional column on requisition template called additionalQuantityRequired.
OLMIS-4966: Add additional column on requisition template called additionalQuantityRequired.
OLMIS-4966: Add additional column on requisition template called additionalQuantityRequired.

This new column cannot be displayed if the template does not display the adjusted consumption field.

If additionalQuantityRequired column is displayed, the calculation of adjusted consumption will be influenced.

    • -2
    • +48
    /demo-data/requisition.columns_maps.json
    • -0
    • +13
    /src/main/resources/db/migration/20180706200019454__add_additional_quantity_required_column.sql
Fix indentation

Add missing test

Seems to test the opposite of what the name implies.

Seems to test the opposite of what the name implies.

does the if condition test read, queryParams contains programId but does not contain facilityId? if so the error message seems to not match.

does the if condition test read, queryParams contains programId but does not contain facilityId? if so the error message seems to not match.

OLMIS-4865: Address code review feedbacks

Use array.filter instead of angular.forEach functions

Add documentation @return

Move error handling code to catch(

    • -7
    • +11
    /src/requisition/requisitions.service.js