Skip to content
This repository has been archived by the owner on Nov 26, 2024. It is now read-only.

Commit

Permalink
Merge pull request #843 from egovernments/paygov-dev
Browse files Browse the repository at this point in the history 
Paygov dev
  • Loading branch information
@pradeepkumarcm-egov
pradeepkumarcm-egov authored Jul 4, 2024
2 parents 9157e7a + aec80ca commit 075e76a
Show file tree
Hide file tree
Showing 5 changed files with 130 additions and 99 deletions.
83 changes: 45 additions & 38 deletions frontend/mgramseva/lib/screeens/add_expense/expense_details.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,32 +163,34 @@ class _ExpenseDetailsState extends State<ExpenseDetails> {
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
HomeBack(
widget: Help(
callBack: () => showGeneralDialog(
barrierLabel: "Label",
barrierDismissible: false,
barrierColor: Colors.black.withOpacity(0.5),
transitionDuration: Duration(milliseconds: 700),
context: context,
pageBuilder: (context, anim1, anim2) {
return ExpenseWalkThroughContainer((index) =>
expenseProvider.incrementindex(
index,
expenseProvider
.expenseWalkthrougList[index + 1].key));
},
transitionBuilder: (context, anim1, anim2, child) {
return SlideTransition(
position:
Tween(begin: Offset(0, 1), end: Offset(0, 0))
.animate(anim1),
child: child,
);
},
),
walkThroughKey: Constants.ADD_EXPENSE_KEY,
)),
// ExpenseWalkThroughContainer Is Removed
// HomeBack(
// widget: Help(
// callBack: () => showGeneralDialog(
// barrierLabel: "Label",
// barrierDismissible: false,
// barrierColor: Colors.black.withOpacity(0.5),
// transitionDuration: Duration(milliseconds: 700),
// context: context,
// pageBuilder: (context, anim1, anim2) {
// return ExpenseWalkThroughContainer((index) =>
// expenseProvider.incrementindex(
// index,
// expenseProvider
// .expenseWalkthrougList[index + 1].key));
// },
// transitionBuilder: (context, anim1, anim2, child) {
// return SlideTransition(
// position:
// Tween(begin: Offset(0, 1), end: Offset(0, 0))
// .animate(anim1),
// child: child,
// );
// },
// ),
// walkThroughKey: Constants.ADD_EXPENSE_KEY,
// )),
HomeBack(),
Card(
child: Consumer<ExpensesDetailsProvider>(
builder: (_, expensesDetailsProvider, child) => Form(
Expand Down Expand Up @@ -462,18 +464,23 @@ class _ExpenseDetailsState extends State<ExpenseDetails> {
expenseProvider.expenseWalkthrougList[4].key,
key: Keys.expense.EXPENSE_PARTY_DATE,
),
RadioButtonFieldBuilder(
context,
i18.expense.HAS_THIS_BILL_PAID,
expensesDetailsProvider
.expenditureDetails.isBillPaid,
'',
'',
true,
Constants.EXPENSESTYPE,
expensesDetailsProvider.onChangeOfBillPaid,
isEnabled: expensesDetailsProvider
.expenditureDetails.allowEdit),
AbsorbPointer(
absorbing: expensesDetailsProvider
.expenditureDetails
.isBillCancelled == true ? true : false,
child: RadioButtonFieldBuilder(
context,
i18.expense.HAS_THIS_BILL_PAID,
expensesDetailsProvider
.expenditureDetails.isBillPaid,
'',
'',
true,
Constants.EXPENSESTYPE,
expensesDetailsProvider.onChangeOfBillPaid,
isEnabled: expensesDetailsProvider
.expenditureDetails.allowEdit),
),
if (expensesDetailsProvider.expenditureDetails.isBillPaid ?? false)
BasicDateField(i18.expense.PAYMENT_DATE, true,
expensesDetailsProvider.expenditureDetails.paidDateCtrl,
Expand Down
54 changes: 28 additions & 26 deletions frontend/mgramseva/lib/screeens/consumer_details/consumer_details.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,32 +157,34 @@ class _ConsumerDetailsState extends State<ConsumerDetails> {
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
HomeBack(
widget: Help(
callBack: () => showGeneralDialog(
barrierLabel: "Label",
barrierDismissible: false,
barrierColor: Colors.black.withOpacity(0.5),
transitionDuration: Duration(milliseconds: 700),
context: context,
pageBuilder: (context, anim1, anim2) {
return WalkThroughContainer((index) =>
consumerProvider.incrementIndex(
index,
consumerProvider
.consmerWalkthrougList[index + 1].key));
},
transitionBuilder: (context, anim1, anim2, child) {
return SlideTransition(
position:
Tween(begin: Offset(0, 1), end: Offset(0, 0))
.animate(anim1),
child: child,
);
},
),
walkThroughKey: Constants.CREATE_CONSUMER_KEY,
)),
// ConsmerWalkthrougList Is Removed
// HomeBack(
// widget: Help(
// callBack: () => showGeneralDialog(
// barrierLabel: "Label",
// barrierDismissible: false,
// barrierColor: Colors.black.withOpacity(0.5),
// transitionDuration: Duration(milliseconds: 700),
// context: context,
// pageBuilder: (context, anim1, anim2) {
// return WalkThroughContainer((index) =>
// consumerProvider.incrementIndex(
// index,
// consumerProvider
// .consmerWalkthrougList[index + 1].key));
// },
// transitionBuilder: (context, anim1, anim2, child) {
// return SlideTransition(
// position:
// Tween(begin: Offset(0, 1), end: Offset(0, 0))
// .animate(anim1),
// child: child,
// );
// },
// ),
// walkThroughKey: Constants.CREATE_CONSUMER_KEY,
// )),
HomeBack(),
Card(
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
Expand Down
13 changes: 4 additions & 9 deletions frontend/mgramseva/lib/screeens/generate_bill/widgets/count_table_widget.dart
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import 'dart:developer';

import 'package:flutter/material.dart';
import 'package:mgramseva/model/reports/WaterConnectionCount.dart';
import 'package:mgramseva/utils/constants/i18_key_constants.dart';
Expand Down Expand Up @@ -27,18 +29,10 @@ class _CountTableWidgetState extends State<CountTableWidget> {
children: [
LayoutBuilder(
builder: (context, constraints) {
if (constraints.maxWidth <= 760) {
return Container(
width: MediaQuery.of(context).size.width,
child: FittedBox(
child: _buildDataTable(connectionCount!),
),
child: _buildDataTable(connectionCount!),
);
} else {
return Container(
width: MediaQuery.of(context).size.width,
child: _buildDataTable(connectionCount!));
}
},
),
if (connectionCount!.length > 5)
Expand Down Expand Up @@ -96,6 +90,7 @@ class _CountTableWidgetState extends State<CountTableWidget> {

return DataRow(
color: MaterialStateColor.resolveWith((states) => rowColor!), // Apply alternate row background color

cells: [
DataCell(
Text(
Expand Down
49 changes: 25 additions & 24 deletions frontend/mgramseva/lib/screeens/home/home.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,30 +44,31 @@ class _HomeState extends State<Home> {

_buildView(homeProvider, Widget notification) {
return Column(children: [
Align(
alignment: Alignment.centerRight,
child: Help(
callBack: () => showGeneralDialog(
barrierLabel: "Label",
barrierDismissible: false,
barrierColor: Colors.black.withOpacity(0.5),
transitionDuration: Duration(milliseconds: 700),
context: context,
pageBuilder: (context, anim1, anim2) {
return HomeWalkThroughContainer((index) =>
homeProvider.incrementIndex(index,
homeProvider.homeWalkthroughList[index + 1].key));
},
transitionBuilder: (context, anim1, anim2, child) {
return SlideTransition(
position: Tween(begin: Offset(0, 1), end: Offset(0, 0))
.animate(anim1),
child: child,
);
},
),
walkThroughKey: Constants.HOME_KEY,
)),
/* Note : WalkThroughContainer Is Removed */
// Align(
// alignment: Alignment.centerRight,
// child: Help(
// callBack: () => showGeneralDialog(
// barrierLabel: "Label",
// barrierDismissible: false,
// barrierColor: Colors.black.withOpacity(0.5),
// transitionDuration: Duration(milliseconds: 700),
// context: context,
// pageBuilder: (context, anim1, anim2) {
// return HomeWalkThroughContainer((index) =>
// homeProvider.incrementIndex(index,
// homeProvider.homeWalkthroughList[index + 1].key));
// },
// transitionBuilder: (context, anim1, anim2, child) {
// return SlideTransition(
// position: Tween(begin: Offset(0, 1), end: Offset(0, 0))
// .animate(anim1),
// child: child,
// );
// },
// ),
// walkThroughKey: Constants.HOME_KEY,
// )),
HomeCard(),
notification,
Footer()
Expand Down
30 changes: 28 additions & 2 deletions ...tend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/inbox/search.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ const SearchApplication = ({ onSearch, type, onClose, searchFields, searchParams
</div>
)}
<div className="complaint-input-container" style={{ width: "100%" }}>


{searchFields
?.filter((e) => true)
?.map((input, index) => (
Expand All @@ -83,8 +85,14 @@ const SearchApplication = ({ onSearch, type, onClose, searchFields, searchParams
</span>
</div>
))}
</div>
<div className="inbox-action-container">
{/* Updated Search & Clear All Button */}
<div style={{
marginTop: "2rem",
display: "flex",
alignItems: "center",
justifyContent: "space-evenly"
}} >
<div className="complaint-input-container">
{type === "desktop" && !mobileView && (
<span style={{ paddingTop: "9px" }} className="clear-search">
{clearAll()}
Expand All @@ -99,6 +107,24 @@ const SearchApplication = ({ onSearch, type, onClose, searchFields, searchParams
/>
)}
</div>
</div>
</div>
{/*Don't Remove : Chance of Updated Search & Clear All Button*/}
{/* <div className="inbox-action-container">
{type === "desktop" && !mobileView && (
<span style={{ paddingTop: "9px" }} className="clear-search">
{clearAll()}
</span>
)}
{type === "desktop" && !mobileView && (
<SubmitBar
style={{ marginTop: "unset" }}
className="submit-bar-search"
label={t("ES_COMMON_SEARCH")}
submit
/>
)}
</div> */}
</div>
</div>
{(type === "mobile" || mobileView) && (
Expand Down

0 comments on commit 075e76a

Please sign in to comment.