diff --git a/campus/bffs/asset/api/Dependencies.toml b/campus/bffs/asset/api/Dependencies.toml index ec2c1d61..2d5ff534 100644 --- a/campus/bffs/asset/api/Dependencies.toml +++ b/campus/bffs/asset/api/Dependencies.toml @@ -5,7 +5,7 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.5.0" +distribution-version = "2201.8.7" [[package]] org = "avinyafoundation" @@ -26,7 +26,7 @@ modules = [ [[package]] org = "ballerina" name = "auth" -version = "2.8.0" +version = "2.10.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -38,7 +38,7 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.5.0" +version = "3.8.0" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "jballerina.java"}, @@ -49,7 +49,7 @@ dependencies = [ [[package]] org = "ballerina" name = "constraint" -version = "1.2.0" +version = "1.5.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -57,7 +57,7 @@ dependencies = [ [[package]] org = "ballerina" name = "crypto" -version = "2.3.2" +version = "2.6.3" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -66,7 +66,7 @@ dependencies = [ [[package]] org = "ballerina" name = "file" -version = "1.7.1" +version = "1.9.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -77,25 +77,30 @@ dependencies = [ [[package]] org = "ballerina" name = "graphql" -version = "1.8.1" +version = "1.11.2" dependencies = [ {org = "ballerina", name = "auth"}, + {org = "ballerina", name = "cache"}, + {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "file"}, {org = "ballerina", name = "http"}, {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "jwt"}, {org = "ballerina", name = "lang.array"}, + {org = "ballerina", name = "lang.regexp"}, {org = "ballerina", name = "lang.value"}, {org = "ballerina", name = "log"}, {org = "ballerina", name = "mime"}, {org = "ballerina", name = "oauth2"}, {org = "ballerina", name = "task"}, {org = "ballerina", name = "time"}, + {org = "ballerina", name = "uuid"}, {org = "ballerina", name = "websocket"} ] modules = [ {org = "ballerina", packageName = "graphql", moduleName = "graphql"}, + {org = "ballerina", packageName = "graphql", moduleName = "graphql.dataloader"}, {org = "ballerina", packageName = "graphql", moduleName = "graphql.parser"}, {org = "ballerina", packageName = "graphql", moduleName = "graphql.subgraph"} ] @@ -103,7 +108,7 @@ modules = [ [[package]] org = "ballerina" name = "http" -version = "2.8.7" +version = "2.10.15" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, @@ -128,13 +133,14 @@ dependencies = [ {org = "ballerina", name = "url"} ] modules = [ - {org = "ballerina", packageName = "http", moduleName = "http"} + {org = "ballerina", packageName = "http", moduleName = "http"}, + {org = "ballerina", packageName = "http", moduleName = "http.httpscerr"} ] [[package]] org = "ballerina" name = "io" -version = "1.4.1" +version = "1.6.1" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.value"} @@ -151,7 +157,7 @@ version = "0.0.0" [[package]] org = "ballerina" name = "jwt" -version = "2.8.0" +version = "2.10.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -188,6 +194,15 @@ dependencies = [ {org = "ballerina", name = "jballerina.java"} ] +[[package]] +org = "ballerina" +name = "lang.error" +version = "0.0.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"} +] + [[package]] org = "ballerina" name = "lang.int" @@ -239,7 +254,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.7.1" +version = "2.9.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -253,7 +268,7 @@ modules = [ [[package]] org = "ballerina" name = "mime" -version = "2.7.1" +version = "2.9.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -263,7 +278,7 @@ dependencies = [ [[package]] org = "ballerina" name = "oauth2" -version = "2.8.0" +version = "2.10.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -276,7 +291,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.0.7" +version = "1.2.3" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -284,7 +299,7 @@ dependencies = [ [[package]] org = "ballerina" name = "os" -version = "1.6.0" +version = "1.8.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"} @@ -293,7 +308,7 @@ dependencies = [ [[package]] org = "ballerina" name = "task" -version = "2.3.2" +version = "2.5.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -305,7 +320,8 @@ name = "test" version = "0.0.0" scope = "testOnly" dependencies = [ - {org = "ballerina", name = "jballerina.java"} + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.error"} ] modules = [ {org = "ballerina", packageName = "test", moduleName = "test"} @@ -314,7 +330,7 @@ modules = [ [[package]] org = "ballerina" name = "time" -version = "2.2.5" +version = "2.4.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -322,15 +338,26 @@ dependencies = [ [[package]] org = "ballerina" name = "url" -version = "2.2.4" +version = "2.4.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] +[[package]] +org = "ballerina" +name = "uuid" +version = "1.7.0" +dependencies = [ + {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.int"}, + {org = "ballerina", name = "time"} +] + [[package]] org = "ballerina" name = "websocket" -version = "2.8.2" +version = "2.10.2" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "constraint"}, diff --git a/campus/bffs/profile/api/Dependencies.toml b/campus/bffs/profile/api/Dependencies.toml index 335cb62a..8eef60ad 100644 --- a/campus/bffs/profile/api/Dependencies.toml +++ b/campus/bffs/profile/api/Dependencies.toml @@ -5,7 +5,7 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.5.0" +distribution-version = "2201.8.7" [[package]] org = "avinyafoundation" @@ -26,7 +26,7 @@ modules = [ [[package]] org = "ballerina" name = "auth" -version = "2.8.0" +version = "2.10.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -38,7 +38,7 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.5.0" +version = "3.8.0" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "jballerina.java"}, @@ -49,7 +49,7 @@ dependencies = [ [[package]] org = "ballerina" name = "constraint" -version = "1.2.0" +version = "1.5.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -57,7 +57,7 @@ dependencies = [ [[package]] org = "ballerina" name = "crypto" -version = "2.3.2" +version = "2.6.3" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -66,7 +66,7 @@ dependencies = [ [[package]] org = "ballerina" name = "file" -version = "1.7.1" +version = "1.9.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -77,25 +77,30 @@ dependencies = [ [[package]] org = "ballerina" name = "graphql" -version = "1.8.1" +version = "1.11.2" dependencies = [ {org = "ballerina", name = "auth"}, + {org = "ballerina", name = "cache"}, + {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "file"}, {org = "ballerina", name = "http"}, {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "jwt"}, {org = "ballerina", name = "lang.array"}, + {org = "ballerina", name = "lang.regexp"}, {org = "ballerina", name = "lang.value"}, {org = "ballerina", name = "log"}, {org = "ballerina", name = "mime"}, {org = "ballerina", name = "oauth2"}, {org = "ballerina", name = "task"}, {org = "ballerina", name = "time"}, + {org = "ballerina", name = "uuid"}, {org = "ballerina", name = "websocket"} ] modules = [ {org = "ballerina", packageName = "graphql", moduleName = "graphql"}, + {org = "ballerina", packageName = "graphql", moduleName = "graphql.dataloader"}, {org = "ballerina", packageName = "graphql", moduleName = "graphql.parser"}, {org = "ballerina", packageName = "graphql", moduleName = "graphql.subgraph"} ] @@ -103,7 +108,7 @@ modules = [ [[package]] org = "ballerina" name = "http" -version = "2.8.7" +version = "2.10.15" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, @@ -128,13 +133,14 @@ dependencies = [ {org = "ballerina", name = "url"} ] modules = [ - {org = "ballerina", packageName = "http", moduleName = "http"} + {org = "ballerina", packageName = "http", moduleName = "http"}, + {org = "ballerina", packageName = "http", moduleName = "http.httpscerr"} ] [[package]] org = "ballerina" name = "io" -version = "1.4.1" +version = "1.6.1" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.value"} @@ -151,7 +157,7 @@ version = "0.0.0" [[package]] org = "ballerina" name = "jwt" -version = "2.8.0" +version = "2.10.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -188,6 +194,15 @@ dependencies = [ {org = "ballerina", name = "jballerina.java"} ] +[[package]] +org = "ballerina" +name = "lang.error" +version = "0.0.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"} +] + [[package]] org = "ballerina" name = "lang.int" @@ -239,7 +254,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.7.1" +version = "2.9.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -253,7 +268,7 @@ modules = [ [[package]] org = "ballerina" name = "mime" -version = "2.7.1" +version = "2.9.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -263,7 +278,7 @@ dependencies = [ [[package]] org = "ballerina" name = "oauth2" -version = "2.8.0" +version = "2.10.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -276,7 +291,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.0.7" +version = "1.2.3" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -284,7 +299,7 @@ dependencies = [ [[package]] org = "ballerina" name = "os" -version = "1.6.0" +version = "1.8.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"} @@ -293,7 +308,7 @@ dependencies = [ [[package]] org = "ballerina" name = "task" -version = "2.3.2" +version = "2.5.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -305,7 +320,8 @@ name = "test" version = "0.0.0" scope = "testOnly" dependencies = [ - {org = "ballerina", name = "jballerina.java"} + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.error"} ] modules = [ {org = "ballerina", packageName = "test", moduleName = "test"} @@ -314,7 +330,7 @@ modules = [ [[package]] org = "ballerina" name = "time" -version = "2.2.5" +version = "2.4.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -322,15 +338,26 @@ dependencies = [ [[package]] org = "ballerina" name = "url" -version = "2.2.4" +version = "2.4.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] +[[package]] +org = "ballerina" +name = "uuid" +version = "1.7.0" +dependencies = [ + {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.int"}, + {org = "ballerina", name = "time"} +] + [[package]] org = "ballerina" name = "websocket" -version = "2.8.2" +version = "2.10.2" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "constraint"}, diff --git a/campus/frontend/lib/avinya/asset_admin/lib/widgets/stock_depletion.dart b/campus/frontend/lib/avinya/asset_admin/lib/widgets/stock_depletion.dart index f5643d48..f5914c4a 100644 --- a/campus/frontend/lib/avinya/asset_admin/lib/widgets/stock_depletion.dart +++ b/campus/frontend/lib/avinya/asset_admin/lib/widgets/stock_depletion.dart @@ -172,52 +172,59 @@ class _StockDepletionState extends State { var formattedDate = formatDateTime(_selectedDate); for (var item in _fetchedStockList) { - DateTime itemDate = DateTime.parse(item.updated!).toLocal(); - DateTime itemDateOnly = - DateTime(itemDate.year, itemDate.month, itemDate.day); - DateTime currentDate = DateTime.now().toLocal(); - if (_selectedDate.year == currentDate.year && - _selectedDate.month == currentDate.month && - _selectedDate.day == currentDate.day) { - if (_selectedDate.isAfter(itemDateOnly) && - item.quantity_out != 0 && - _selectedDate.day != itemDateOnly.day) { - _showQtyIn = false; - _backDate = false; - } else if (_selectedDate.isBefore(itemDateOnly) && - item.quantity_out != 0 && - _selectedDate.day != itemDateOnly.day) { - _showQtyIn = false; - _backDate = false; - } else if (item.quantity_out != 0) { - _isSubmitting = false; - _showQtyIn = true; - _backDate = false; - _isUpdate = true; + if (item.updated != null) { + DateTime itemDate = DateTime.parse(item.updated!).toLocal(); + DateTime itemDateOnly = + DateTime(itemDate.year, itemDate.month, itemDate.day); + DateTime currentDate = DateTime.now().toLocal(); + if (_selectedDate.year == currentDate.year && + _selectedDate.month == currentDate.month && + _selectedDate.day == currentDate.day) { + if (_selectedDate.isAfter(itemDateOnly) && + item.quantity_out != 0 && + _selectedDate.day != itemDateOnly.day) { + _showQtyIn = false; + _backDate = false; + } else if (_selectedDate.isBefore(itemDateOnly) && + item.quantity_out != 0 && + _selectedDate.day != itemDateOnly.day) { + _showQtyIn = false; + _backDate = false; + } else if (item.quantity_out != 0) { + _isSubmitting = false; + _showQtyIn = true; + _backDate = false; + _isUpdate = true; + } else { + _isSubmitting = false; + _showQtyIn = false; + _backDate = false; + _isUpdate = false; + } + } else if (_selectedDate.isBefore(currentDate)) { + if (_selectedDate.isAfter(itemDateOnly) && item.quantity_out != 0) { + _isSubmitting = false; + _showQtyIn = false; + _backDate = false; + _isUpdate = true; + break; + } else if (_selectedDate.isBefore(itemDateOnly)) { + _isSubmitting = true; + _showQtyIn = true; + _backDate = true; + _isUpdate = true; + } else { + _isSubmitting = true; + _backDate = false; + _showQtyIn = false; + _isUpdate = false; + } } else { _isSubmitting = false; _showQtyIn = false; _backDate = false; _isUpdate = false; } - } else if (_selectedDate.isBefore(currentDate)) { - if (_selectedDate.isAfter(itemDateOnly) && item.quantity_out != 0) { - _isSubmitting = false; - _showQtyIn = false; - _backDate = false; - _isUpdate = true; - break; - } else if (_selectedDate.isBefore(itemDateOnly)) { - _isSubmitting = true; - _showQtyIn = true; - _backDate = true; - _isUpdate = true; - } else { - _isSubmitting = true; - _backDate = false; - _showQtyIn = false; - _isUpdate = false; - } } else { _isSubmitting = false; _showQtyIn = false; diff --git a/campus/frontend/lib/avinya/asset_admin/lib/widgets/stock_replenishment.dart b/campus/frontend/lib/avinya/asset_admin/lib/widgets/stock_replenishment.dart index 897ae33f..8a060d0a 100644 --- a/campus/frontend/lib/avinya/asset_admin/lib/widgets/stock_replenishment.dart +++ b/campus/frontend/lib/avinya/asset_admin/lib/widgets/stock_replenishment.dart @@ -174,63 +174,70 @@ class _StockReplenishmentState extends State { var formattedDate = formatDateTime(_selectedDate); for (var item in _fetchedStockList) { - DateTime itemDate = DateTime.parse(item.updated!).toLocal(); - DateTime itemDateOnly = - DateTime(itemDate.year, itemDate.month, itemDate.day); - DateTime currentDate = DateTime.now().toLocal(); - if (item.quantity_out != 0) { - if (_selectedDate.day == currentDate.day) { - _isSubmitting = false; - _showQtyIn = false; - _backDate = false; - _isUpdate = false; - } else { - _isUpdate = true; - _backDate = false; - _isSubmitting = true; - _showQtyIn = false; - // this is a depletion - } - } else { - if (_selectedDate.year == currentDate.year && - _selectedDate.month == currentDate.month && - _selectedDate.day == currentDate.day) { - if (_selectedDate.isAfter(itemDateOnly) && - item.quantity_in != 0 && - _selectedDate.day != itemDateOnly.day) { + if (item.updated != null) { + DateTime itemDate = DateTime.parse(item.updated!).toLocal(); + DateTime itemDateOnly = + DateTime(itemDate.year, itemDate.month, itemDate.day); + DateTime currentDate = DateTime.now().toLocal(); + if (item.quantity_out != 0) { + if (_selectedDate.day == currentDate.day) { + _isSubmitting = false; _showQtyIn = false; _backDate = false; _isUpdate = false; } else { - _isSubmitting = false; - _showQtyIn = true; - _backDate = false; _isUpdate = true; + _backDate = false; + _isSubmitting = true; + _showQtyIn = false; + // this is a depletion } - } else if (_selectedDate.isBefore(currentDate)) { - if (_selectedDate.isAfter(itemDateOnly) && item.quantity_in != 0) { + } else { + if (_selectedDate.year == currentDate.year && + _selectedDate.month == currentDate.month && + _selectedDate.day == currentDate.day) { + if (_selectedDate.isAfter(itemDateOnly) && + item.quantity_in != 0 && + _selectedDate.day != itemDateOnly.day) { + _showQtyIn = false; + _backDate = false; + _isUpdate = false; + } else { + _isSubmitting = false; + _showQtyIn = true; + _backDate = false; + _isUpdate = true; + } + } else if (_selectedDate.isBefore(currentDate)) { + if (_selectedDate.isAfter(itemDateOnly) && item.quantity_in != 0) { + _isSubmitting = false; + _showQtyIn = false; + _backDate = false; + _isUpdate = false; + break; + } else if (_selectedDate.isBefore(itemDateOnly)) { + _isSubmitting = true; + _showQtyIn = true; + _backDate = true; + _isUpdate = true; + } else { + _isSubmitting = true; + _backDate = false; + _showQtyIn = true; + _isUpdate = true; + } + } else { _isSubmitting = false; _showQtyIn = false; _backDate = false; _isUpdate = false; - break; - } else if (_selectedDate.isBefore(itemDateOnly)) { - _isSubmitting = true; - _showQtyIn = true; - _backDate = true; - _isUpdate = true; - } else { - _isSubmitting = true; - _backDate = false; - _showQtyIn = true; - _isUpdate = true; } - } else { - _isSubmitting = false; - _showQtyIn = false; - _backDate = false; - _isUpdate = false; } + } else { + _isSubmitting = false; + _showQtyIn = false; + _backDate = false; + _isUpdate = false; } }