Merge branch 'develop'

Author: mark-prins

build/windows/demo/local.yaml

@@ -12,6 +12,6 @@ logging:
   level: Info
   directory: log
   filename: remote_server.log
-  max_file_count: 5
-  max_file_size: 10
+  max_file_count: 10
+  max_file_size: 1
 

build/windows/omsupply_server.suf

@@ -4207,8 +4207,8 @@ else
 	config = config .. "  level: Warn\r\n";
 	config = config .. "  directory: log\r\n";
 	config = config .. "  filename: omsupply.log\r\n";
-	config = config .. "  max_file_count: 5\r\n";
-	config = config .. "  max_file_size: 10\r\n";
+	config = config .. "  max_file_count: 10\r\n";
+	config = config .. "  max_file_size: 1\r\n";
 	TextFile.WriteFromString(SessionVar.Expand("%AppFolder%\\configuration\\local.yaml"), config, false);
 
 	-- Create omSupply Server keys in registry

build/windows/omsupply_standalone.suf

@@ -3362,8 +3362,8 @@ else
 	config = config .. "  level: Warn\r\n";
 	config = config .. "  directory: log\r\n";
 	config = config .. "  filename: omsupply.log\r\n";
-	config = config .. "  max_file_count: 5\r\n";
-	config = config .. "  max_file_size: 10\r\n";
+	config = config .. "  max_file_count: 10\r\n";
+	config = config .. "  max_file_size: 1\r\n";
 	TextFile.WriteFromString(SessionVar.Expand("%AppFolder%\\server\\configuration\\local.yaml"), config, false);
 
 	-- Create omSupply Server keys in registry

client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "openmsupply-client",
   "//": "Version is shared between client and remote server and is located in repo root package.json",
-  "version": "0.1.0",
+  "version": "0.0.0",
   "sideEffects": false,
   "private": true,
   "scripts": {

client/packages/android/app/src/main/AndroidManifest.xml

@@ -22,6 +22,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
 </manifest>

client/packages/android/app/src/main/java/org/openmsupply/client/FileManager.java

@@ -0,0 +1,51 @@
+package org.openmsupply.client;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.widget.Toast;
+
+import java.io.BufferedWriter;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+
+public class FileManager {
+    private static final int SAVE_FILE_REQUEST = 12321;
+    private Activity activity;
+    private String content;
+
+    public FileManager(Activity activity) {
+        this.activity = activity;
+    }
+
+    public void Save(String filename, String content) {
+        Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT);
+        intent.addCategory(Intent.CATEGORY_OPENABLE);
+        intent.setType("text/plain");
+        intent.putExtra(Intent.EXTRA_TITLE, filename);
+        // This was a neat idea, but only works with small amounts of text!
+        // With a few hundred KB the file chooser closes immediately on open
+        // intent.putExtra(Intent.EXTRA_TEXT, content);
+        this.content = content;
+
+        activity.startActivityForResult(intent, SAVE_FILE_REQUEST);
+    }
+
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == SAVE_FILE_REQUEST && resultCode == Activity.RESULT_OK && data != null) {
+            Uri uri = data.getData();
+            Context context = activity.getApplicationContext();
+
+            try {
+                OutputStream outputStream = context.getContentResolver().openOutputStream(uri);
+                BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(outputStream));
+                bw.write(content);
+                bw.flush();
+                bw.close();
+            } catch (Exception e) {
+                Toast.makeText(context, "Error: " + e.getMessage(), Toast.LENGTH_LONG).show();
+            }
+        }
+    }
+}

client/packages/android/app/src/main/java/org/openmsupply/client/MainActivity.java

@@ -1,18 +1,21 @@
 package org.openmsupply.client;
 
+import android.content.Intent;
 import android.os.Bundle;
 import com.getcapacitor.BridgeActivity;
 
 public class MainActivity extends BridgeActivity {
     RemoteServer server = new RemoteServer();
     DiscoveryConstants discoveryConstants;
+    private FileManager fileManager;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         registerPlugin(NativeApi.class);
         super.onCreate(savedInstanceState);
 
         discoveryConstants = new DiscoveryConstants(getContentResolver());
+        fileManager = new FileManager(this);
 
         String path = getFilesDir().getAbsolutePath();
         String cache = getCacheDir().getAbsolutePath();
@@ -24,4 +27,17 @@ public void onDestroy() {
         super.onDestroy();
         server.stop();
     }
+
+    // ActivityResult needs to be overridden in the main, not UI thread
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        fileManager.onActivityResult(requestCode, resultCode, data);
+    }
+
+    // Implementing here, so that we can use the FileManager instance
+    public void SaveFile(String filename, String content) {
+        fileManager.Save(filename, content);
+    }
 }

client/packages/android/app/src/main/java/org/openmsupply/client/NativeApi.java

@@ -4,9 +4,15 @@
 
 import android.net.nsd.NsdManager;
 import android.net.nsd.NsdServiceInfo;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.Log;
 import android.webkit.WebView;
 
+import androidx.annotation.MainThread;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.getcapacitor.Bridge;
 import com.getcapacitor.JSArray;
 import com.getcapacitor.JSObject;
@@ -28,17 +34,15 @@
 import java.util.ArrayDeque;
 import java.util.Deque;
 
-import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLHandshakeException;
-import javax.net.ssl.SSLSocketFactory;
 
 @CapacitorPlugin(name = "NativeApi")
 public class NativeApi extends Plugin implements NsdManager.DiscoveryListener {
     private static final String LOG_FILE_NAME = "remote_server.log";
     public static final String OM_SUPPLY = "omSupply";
     private static final Integer DEFAULT_PORT = DiscoveryConstants.PORT;
     private static final String DEFAULT_URL = "https://localhost:" + DEFAULT_PORT + "/";
-    private static final String CONFIGURATION_GROUP = "omSupply_preferences";
+
     DiscoveryConstants discoveryConstants;
     JSArray discoveredServers;
     Deque<NsdServiceInfo> serversToResolve;
@@ -442,7 +446,27 @@ public void readLog(PluginCall call) {
         call.resolve(response);
     }
 
-    /** Helper class to get access to the JS FrontEndHost data */
+    @PluginMethod()
+    public void saveFile(@NonNull PluginCall call) {
+        JSObject data = call.getData();
+        JSObject response = new JSObject();
+
+        String filename = data.getString("filename", LOG_FILE_NAME);
+        String content = data.getString("content");
+
+        if(content == null){
+            response.put("error", "No content");
+            response.put("success", false);
+        }else{
+            MainActivity mainActivity = (MainActivity) getActivity();
+            mainActivity.SaveFile(filename, content);
+            response.put("success", true);
+        }
+
+        call.resolve(response);
+    }
+
+        /** Helper class to get access to the JS FrontEndHost data */
     public class FrontEndHost {
         JSObject data;
 

client/packages/common/src/hooks/useDialog/useDialog.tsx

@@ -29,6 +29,7 @@ export interface ModalProps {
     } & React.RefAttributes<unknown>
   >;
   okButton?: JSX.Element;
+  reportSelector?: React.ReactElement;
   width?: number;
   sx?: SxProps<Theme>;
   title: string;
@@ -129,6 +130,7 @@ export const useDialog = (dialogProps?: DialogProps): DialogState => {
     height,
     nextButton,
     okButton,
+    reportSelector,
     width,
     title,
     contentProps,
@@ -200,6 +202,7 @@ export const useDialog = (dialogProps?: DialogProps): DialogState => {
           {cancelButton}
           {okButton}
           {WrappedNextButton}
+          {reportSelector}
         </DialogActions>
       </BasicModal>
     );

client/packages/common/src/hooks/useNativeClient/types.ts

@@ -11,6 +11,11 @@ export type ConnectionResult = {
   success: boolean;
   error?: string;
 };
+export type FileInfo = {
+  content: string;
+  filename?: string;
+};
+
 export interface NativeAPI {
   // Method used in polling for found servers
   discoveredServers: () => Promise<{ servers: FrontEndHost[] }>;
@@ -36,6 +41,9 @@ export interface NativeAPI {
   ) => void;
   setScannerType: (server: ScannerType) => void;
   getScannerType: () => Promise<ScannerType>;
+  saveFile: (
+    fileInfo: FileInfo
+  ) => Promise<{ success: boolean; error?: string }>;
 }
 
 export enum NativeMode {

client/packages/common/src/hooks/useNativeClient/useNativeClient.ts

@@ -11,6 +11,7 @@ import {
   ConnectionResult,
   DISCOVERED_SERVER_POLL,
   DISCOVERY_TIMEOUT,
+  FileInfo,
   FrontEndHost,
   NativeAPI,
   NativeMode,
@@ -125,6 +126,17 @@ export const useNativeClient = ({
     if (result.isSupported) await KeepAwake.keepAwake();
   };
 
+  const saveFile = async (fileInfo: FileInfo) => {
+    const result = await nativeAPI?.saveFile(fileInfo);
+
+    if (!result) {
+      console.error('No result from nativeAPI.saveFile');
+      return;
+    }
+
+    return result;
+  };
+
   useEffect(() => {
     if (!state.isDiscovering) return;
 
@@ -183,5 +195,6 @@ export const useNativeClient = ({
     readLog,
     keepAwake,
     allowSleep,
+    saveFile,
   };
 };

client/packages/common/src/intl/locales/en/common.json

@@ -190,6 +190,7 @@
   "label.server-log": "Server log",
   "label.reference": "Reference",
   "label.remaining-to-supply": "Remaining",
+  "label.repack": "Repack",
   "label.requested-quantity": "Requested",
   "label.requested-packs": "Requested packs",
   "label.approved-packs": "Approved packs",

client/packages/common/src/intl/locales/en/inventory.json

@@ -1,5 +1,6 @@
 {
   "button.delete-lines": "Delete selected lines",
+  "button.repack": "Repack",
   "button.save-and-confirm-status": "Confirm {{status}}",
   "error.cant-save": "There was a problem saving.",
   "error.no-locations": "There are no Locations to display.",
@@ -15,6 +16,8 @@
   "error.reduced-below-zero": "Stock line exist in new outbound shipments. The quantity cannot be reduced below zero.",
   "error.stocktake-has-stock-reduced-below-zero": "Stock take cannot be finalised because some of the stock has been used in new outbound shipments.",
   "error.unable-to-scan": "Unable to scan barcode: {{error}}",
+  "error.repack-has-stock-reduced-below-zero": "Cannot repack stock line. New number of packs exceeds stock line number of packs.",
+  "error.repack-cannot-be-fractional": "Cannot repack into a fractional pack",
   "label.add-batch": "Add batch",
   "label.add-new-line": "Add a new line",
   "label.cost-price": "Cost price",
@@ -36,6 +39,11 @@
   "label.location": "Location",
   "label.master-list": "Master List",
   "label.items-with-stock": "Items with Stock",
+  "label.new": "New",
+  "label.new-pack-size": "New pack size",
+  "label.new-num-packs": "New number of packs",
+  "label.packs-available": "Packs available",
+  "label.packs-to-repack": "Number of packs to repack",
   "message.no-supplier": "Inventory Adjustment",
   "messages.locked-description": "This will prevent further changes to the stocktake until it is unlocked.",
   "messages.unlocked-description": "This will re-enable changes to the stocktake.",
@@ -64,11 +72,16 @@
   "messages.no-items-with-stock": "No items with stock available",
   "messages.on-hold-stock-take": "This stocktake is on hold and cannot be edited",
   "messages.select-rows-to-delete-them": "Select rows to delete them",
+  "messages.no-repacks": "This stock line has not been repacked. Click New to create a new repack.",
+  "messages.no-repack-detail": "Select a line to view the details of a repack or click new to create a new repack",
+  "messages.all-packs-repacked": "Saved. The previous window has been closed since everything in the stock line has been repacked.",
+  "messages.repack-log-info": "Repacked from stock line",
   "status.new": "New",
   "status.finalised": "Finalised",
   "stocktake.description-template": "Created by {{username}} on {{date}}",
   "stocktake.comment-list-template": "Created using master list '{{list}}'",
   "stocktake.comment-location-template": "Created using items in location '{{location}}'",
   "stocktake-comment-items-have-stock-template": "Created using items that have stock",
-  "title.stock-line-details": "Stock Line Details"
+  "title.stock-line-details": "Stock Line Details",
+  "title.repack-details": "Repack Details"
 }