From 2d4bf56faea2e6942091c488e2fcd4f98c43e6f6 Mon Sep 17 00:00:00 2001 From: jefry Date: Thu, 27 May 2021 16:59:54 +0700 Subject: [PATCH] fixing upload --- lib/asset_logs.dart | 6 ++++-- lib/util/dbHandler.dart | 11 +++++++++++ lib/util/download_Upload_Handler.dart | 4 +++- lib/util/utils.dart | 5 +++-- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/lib/asset_logs.dart b/lib/asset_logs.dart index 9ea94a8..af57db4 100644 --- a/lib/asset_logs.dart +++ b/lib/asset_logs.dart @@ -22,9 +22,10 @@ class _AssetLogsState extends State { String search = ''; fetchData()async{ var dbName = await DBHelper.database.getDbName(); + var bUnit = await DBHelper.database.getBUnit(); // result. - var result = await util.JsonDataPostRaw({"dbName" : dbName , "redirect" : "FALSE" , "auditedData" : "FALSE"}, "${prefs.getString(keyClass.hostAddress)??"http://172.16.4.144:3000"}/admin/data/dbDetail"); - if(result['STATUS']!='ERROR'){ + var result = await util.JsonDataPostRaw({"bUnit":bUnit,"dbName" : dbName , "redirect" : "FALSE" , "auditedData" : "FALSE"}, "${prefs.getString(keyClass.hostAddress)??"http://172.16.4.144:3000"}/admin/data/dbDetail"); + if(result['STATUS']!=0){ var arrayList = result['DATA']['nonAuditedData']; nonAuditedAsset.clear(); for(int i = 0 ; i { }); } else{ + print(result); util.showToast('ALERT', "Can't reach the server."); Navigator.pop(context); } diff --git a/lib/util/dbHandler.dart b/lib/util/dbHandler.dart index d3c0fc2..429e0dd 100644 --- a/lib/util/dbHandler.dart +++ b/lib/util/dbHandler.dart @@ -245,5 +245,16 @@ class DBHelper{ return null; } } + getBUnit()async{ + try{ + final database = await db; + var res = await database.rawQuery("SELECT ${columnName.value} FROM ${tableName.key} where ${columnName.key} = 'BUSINESS_UNIT'"); + return res.isEmpty?null:res.first[columnName.value]; + } + catch(e){ + print(e); + return null; + } + } } diff --git a/lib/util/download_Upload_Handler.dart b/lib/util/download_Upload_Handler.dart index 70b3662..3f9c432 100644 --- a/lib/util/download_Upload_Handler.dart +++ b/lib/util/download_Upload_Handler.dart @@ -26,6 +26,7 @@ class file_Trans_Handler { StreamController _progress = new StreamController(); Stream get progress =>_progress.stream; var client = new Client(); + var headers = {'device':'mobile'}; downloadFile(String fileName,String link) async { StreamedResponse _response; List _bytes = []; @@ -34,7 +35,7 @@ class file_Trans_Handler { _progress.add(null); try { Request req = new Request('GET', Uri.parse(link)); -// req.headers = ''; + req.headers.addAll(headers); _response = await client.send(req).timeout( Duration(seconds: 20)); // _response = await client.get('$link',headers: 'application/json') @@ -76,6 +77,7 @@ class file_Trans_Handler { print(_total/1024); try{ var request = MultipartRequest('POST', Uri.parse(link)); + request.headers.addAll(headers); request.files.add(await MultipartFile.fromPath('sqliteDb', file.path)); request.fields[keyClass.user] = user; diff --git a/lib/util/utils.dart b/lib/util/utils.dart index 68dc986..e27e18a 100644 --- a/lib/util/utils.dart +++ b/lib/util/utils.dart @@ -21,15 +21,16 @@ class Util{ JsonDataPostRaw(Map jsonData, String url,{timeout:false,duration:10}) async{ const JsonDecoder decoder = const JsonDecoder(); try { + var headers = {'device':'mobile','Content-type': 'application/json'}; var response; if (timeout) response = await http.post( - '$url', headers: {'Content-type': 'application/json'}, + '$url', headers: headers, body: json.encode(jsonData)).timeout( Duration(seconds: duration)); else response = await http.post( - '$url', headers: {'Content-type': 'application/json'}, + '$url', headers: headers, body: json.encode(jsonData)); final Map data = decoder.convert(response.body); return data;