Merge pull request #964 from openmsupply/#960-fix-undefined-stocktake-name

#960 fix undefined stocktake name

Author: Chris-Petty

src/database/utilities/createRecord.js

@@ -206,22 +206,25 @@ const createRequisitionItem = (database, requisition, item, dailyUsage) => {
  * Create a new stocktake.
  *
  * @param   {Realm}      database
- * @param   {User}       user      User creating stocktake.
+ * @param   {User}       user             User creating the stocktake.
+ * @param   {string}     stocktakeName    What to name the stocktake
+ * @param   {Program}    program          Program record to associate with the stocktake
  * @return  {Stocktake}
  */
-const createStocktake = (database, { createdBy, program, name }) => {
+const createStocktake = (database, user, stocktakeName, program) => {
   const date = new Date();
-  const { stocktakeText } = generalStrings;
-  const defaultName = `${stocktakeText} - ${name} - ${formatDateAndTime(date, 'slashes')}`;
+  const serialNumber = getNextNumber(database, STOCKTAKE_SERIAL_NUMBER);
+  const title = program ? program.name : generalStrings.stocktake;
+  const defaultName = `${title} - ${formatDateAndTime(date, 'slashes')}`;
   return database.create('Stocktake', {
     id: generateUUID(),
-    serialNumber: getNextNumber(database, STOCKTAKE_SERIAL_NUMBER),
-    name: name || defaultName,
+    serialNumber,
+    name: stocktakeName || defaultName,
     createdDate: date,
     stocktakeDate: date,
     status: 'suggested',
     comment: '',
-    createdBy,
+    createdBy: user,
     program,
   });
 };

src/pages/StocktakeManagePage.js

@@ -73,13 +73,13 @@ export class StocktakeManagePage extends React.Component {
 
     runWithLoadingIndicator(() => {
       const { currentUser, database, navigateTo } = this.props;
-      const { selection, stocktakeName: name } = this.state;
+      const { selection, stocktakeName } = this.state;
 
       let { stocktake } = this.props;
       database.write(() => {
         // If no |stocktake| came in props, make a new one.
         if (!stocktake) {
-          stocktake = createRecord(database, 'Stocktake', { currentUser, name });
+          stocktake = createRecord(database, 'Stocktake', currentUser, stocktakeName);
         }
 
         stocktake.setItemsByID(database, selection);

src/pages/StocktakesPage.js

@@ -50,9 +50,12 @@ export class StocktakesPage extends React.Component {
 
   createNewStocktake = properties => {
     const { currentUser, database } = this.props;
+    const { steps, program } = properties;
+    const stocktakeName = steps[1].name;
     let stocktake;
+
     database.write(() => {
-      stocktake = createRecord(database, 'Stocktake', { ...properties, createdBy: currentUser });
+      stocktake = createRecord(database, 'Stocktake', currentUser, stocktakeName, program);
       stocktake.addItemsFromProgram(database);
     });
     return stocktake;