Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #931

Merged
merged 50 commits into from
Aug 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
5d422d6
ISTE-379-fix
Hari-egov Aug 20, 2024
737ba1b
ISTE-366
Hari-egov Aug 20, 2024
295296c
ISTE - 363,383,388,379,366
Hari-egov Aug 20, 2024
849af64
ISTE-363,367
Hari-egov Aug 20, 2024
ea3dd57
Added Mdms-migration-tollkit
Aug 20, 2024
e61c4d9
Merge pull request #920 from egovernments/MDMS-Toolkit-local
pradeepkumarcm-egov Aug 20, 2024
8feb10d
ISTE-343-FIX
Hari-egov Aug 20, 2024
d99fb0a
Merge pull request #921 from egovernments/ISTE-379
pradeepkumarcm-egov Aug 21, 2024
db07a57
sort order updated to DESC
Hari-egov Aug 21, 2024
f8ed27f
created new table to store duplicate calls for bill
Taniya1493 Aug 21, 2024
0d037b9
corrected query
Taniya1493 Aug 21, 2024
7d239e1
ISTE-389 adding missing Ledger report label
palak-egov Aug 21, 2024
d901a77
updated query
Taniya1493 Aug 21, 2024
ed821bf
Back btn Will pop depreciated replaced with PopScope
Hari-egov Aug 22, 2024
1efbab2
Leadger iniit Loading disabled
Hari-egov Aug 22, 2024
0de4a52
Update bills_table.dart
palak-egov Aug 22, 2024
3d842f6
updated table name and update query
Taniya1493 Aug 22, 2024
a42955a
updated table name in query
Taniya1493 Aug 22, 2024
7d85496
Merge pull request #923 from palak-egov/patch-5
pradeepkumarcm-egov Aug 22, 2024
d848111
Merge pull request #924 from egovernments/Report-Fixes-and-Frontend
pradeepkumarcm-egov Aug 22, 2024
f049f8e
reports update
Hari-egov Aug 22, 2024
e355848
Report Changes
Hari-egov Aug 22, 2024
308c67c
updated table name for Bulk demand
Taniya1493 Aug 23, 2024
b2cfd17
modified filename
Taniya1493 Aug 23, 2024
5cf7e18
APK Build FIx
Hari-egov Aug 23, 2024
4c94043
build gradle updated
Hari-egov Aug 23, 2024
50fcf65
ISTE-228-FIX
Hari-egov Aug 23, 2024
7198717
ISTE-397
Hari-egov Aug 23, 2024
1661068
Added AuditDetails in Bulk Demand Batch
Taniya1493 Aug 23, 2024
bb7fc54
Merge pull request #922 from egovernments/ISTE-357
pradeepkumarcm-egov Aug 23, 2024
77cd126
babel fix
Hari-egov Aug 23, 2024
42666e5
back route fix
Hari-egov Aug 23, 2024
1291c70
Update V20240821000600__wsc_bulk_create_ddl.sql
Taniya-eGov Aug 23, 2024
26f7d34
Update V20240821000600__wsc_bulk_create_ddl.sql
Taniya-eGov Aug 23, 2024
8308a3c
Merge pull request #926 from egovernments/Taniya-eGov-patch-1
pradeepkumarcm-egov Aug 23, 2024
ee7268e
updated createdtime configuration
Taniya1493 Aug 26, 2024
22905f6
updated sql script for bulk create
Taniya1493 Aug 26, 2024
d3508b0
updated sql script
Taniya1493 Aug 26, 2024
e26edb0
Merge pull request #927 from egovernments/ISTE-357-duplicate
pradeepkumarcm-egov Aug 26, 2024
8596ea6
back button fix check
Hari-egov Aug 26, 2024
429bc2b
updated createdtime
Taniya1493 Aug 26, 2024
5de13f4
drop column createdtime and create again
Taniya1493 Aug 26, 2024
e850488
back call update
Hari-egov Aug 26, 2024
7a3efc1
build gradle updated
Hari-egov Aug 26, 2024
80c2207
loading issue
Hari-egov Aug 26, 2024
3bef244
updated duplicateHours duration
Taniya1493 Aug 26, 2024
f2307d2
Merge pull request #928 from egovernments/ISTE-357-duplicate
pradeepkumarcm-egov Aug 26, 2024
0433a36
Merge pull request #929 from egovernments/google-play-update-and-back…
pradeepkumarcm-egov Aug 26, 2024
7a227f7
Home card key removed (checking)
Hari-egov Aug 26, 2024
db043d8
Merge pull request #930 from egovernments/google-play-update-and-back…
pradeepkumarcm-egov Aug 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions frontend/mgramseva/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
apply plugin: 'com.google.gms.google-services'

android {
compileSdkVersion 33
compileSdkVersion 34
ndkVersion '21.4.7075529'
sourceSets {
main.java.srcDirs += 'src/main/kotlin'
Expand All @@ -42,7 +42,7 @@ android {
defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.dwss.mgramseva"
minSdkVersion flutter.minSdkVersion
minSdkVersion 21
targetSdkVersion 34
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
Expand All @@ -65,6 +65,7 @@ android {

buildTypes {
release {
minifyEnabled true
// TODO: Add your own signing config for the release build.
// Signing with the debug keys for now, so `flutter run --release` works.
signingConfig signingConfigs.release
Expand Down
7 changes: 5 additions & 2 deletions frontend/mgramseva/lib/components/dashboard/bills_table.dart
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ class _BillsTable extends State<BillsTable> {
var textWidget = Text(ApplicationLocalizations.of(context).translate(label),
style: TextStyle(
fontWeight: FontWeight.w700, color: Colors.black, fontSize: 12));

var LedgerLabelText = Text(ApplicationLocalizations.of(context).translate("ledger_label"),style: TextStyle(
fontWeight: FontWeight.w700, color: Colors.black, fontSize: 12));
Comment on lines +114 to +115
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Improve readability.

Consider renaming LedgerLabelText to ledgerLabelText to follow naming conventions for variables.

var ledgerLabelText = Text(ApplicationLocalizations.of(context).translate("ledger_label"),style: TextStyle(
        fontWeight: FontWeight.w700, color: Colors.black, fontSize: 12));
Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
var LedgerLabelText = Text(ApplicationLocalizations.of(context).translate("ledger_label"),style: TextStyle(
fontWeight: FontWeight.w700, color: Colors.black, fontSize: 12));
var ledgerLabelText = Text(ApplicationLocalizations.of(context).translate("ledger_label"),style: TextStyle(
fontWeight: FontWeight.w700, color: Colors.black, fontSize: 12));

return Container(
decoration: isBorderRequired
? BoxDecoration(
Expand All @@ -128,7 +129,9 @@ class _BillsTable extends State<BillsTable> {
textWidget,
Icon(isAscending
? Icons.arrow_upward
: Icons.arrow_downward_sharp)
: Icons.arrow_downward_sharp),
if (MediaQuery.of(context).size.width > 720)
LedgerLabelText
],
)
: textWidget,
Expand Down
6 changes: 1 addition & 5 deletions frontend/mgramseva/lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'dart:async';
import 'dart:developer';
import 'dart:io';
import 'dart:isolate';
import 'dart:ui';
Expand Down Expand Up @@ -164,9 +165,6 @@ class _MyAppState extends State<MyApp> {
CommonProvider.downloadUrl.remove(id);
}
}
setState(() {
// print("Download progress: "+progress.toString());
});
});
FlutterDownloader.registerCallback(downloadCallback);
}
Expand Down Expand Up @@ -291,8 +289,6 @@ class _LandingPageState extends State<LandingPage> {
@override
Widget build(BuildContext context) {
var commonProvider = Provider.of<CommonProvider>(context, listen: false);
var languageProvider =
Provider.of<LanguageProvider>(context, listen: false);
return Scaffold(
body: StreamBuilder(
stream: commonProvider.userLoggedStreamCtrl.stream,
Expand Down
Loading
Loading