sindhu/app_petikes
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into add_change_password

Browse Source
This commit is contained in:
Stephen
2024-01-19 15:11:39 +07:00
parent 81733ec865 c67f771d25
commit 6b28794577
8 changed files with 105 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app_petty_cash/lib/app/constant.dart
View File

@@ -13,7 +13,7 @@ class Constant {
// static String version = "1.00";
// NOTE VERSI HARUS SAMA DENGAN PUBSPEC.YAML
static String version = "1.1.0";
static String version = "1.1.5";
// static String baseUrl = "https://devregonline.pramita.co.id/one-api/xdoc/";

1
app_petty_cash/lib/repository/transaksi_repository.dart
View File

@@ -100,6 +100,7 @@ class TransaksiRepository extends BaseRepository {
'userid': userid,
'sender': sender,
'companyid': M_CompanyID,
'base64File': base64file,
'fileName': fileName,
'fileSize': fileSize,
'fileEkstension': fileExtension

29
app_petty_cash/lib/screen/home/home_screen.dart
View File

@@ -430,7 +430,8 @@ class HomeScreen extends HookConsumerWidget {
Align(
alignment: Alignment.centerLeft,
child: Text(
listTransaksiHome.value[idx].note
listTransaksiHome
.value[idx].note
.toString(),
style: Constant.body1(
context: context)
@@ -446,7 +447,7 @@ class HomeScreen extends HookConsumerWidget {
context: context, y: 10),
),
// Tanggal Created align right
// Tanggal Created and by align right
Row(
mainAxisAlignment:
@@ -472,6 +473,30 @@ class HomeScreen extends HookConsumerWidget {
fontSize: 14,
),
),
Expanded(
child: Container(
child: Text(
' by : ' +
listTransaksiHome
.value[idx]
.usertransaksi
.toString(),
overflow:
TextOverflow.ellipsis,
style: Constant.body1(
context: context)
.copyWith(
fontWeight:
FontWeight.normal,
fontStyle:
FontStyle.italic,
color: Constant
.pcBtnBackgroundColor,
fontSize: 14,
),
),
),
),
],
),
],

76
app_petty_cash/lib/screen/transaksi/history_transaksi_screen.dart
View File

@@ -1362,28 +1362,66 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
),
],
),
// Tanggal Created align right
// Tanggal Created dan by align right
Row(
mainAxisAlignment:
MainAxisAlignment.end,
Column(
children: [
Text(
'created : ' +
formatDateString(
listSearchHistory
.value[idx]
.tanggalcreated
.toString(),
Align(
alignment:
Alignment.centerRight,
child: Row(
mainAxisAlignment:
MainAxisAlignment.end,
children: [
Text(
'created : ' +
formatDateString(
listSearchHistory
.value[idx]
.tanggalcreated
.toString(),
),
overflow:
TextOverflow.ellipsis,
style: Constant.body1(
context: context)
.copyWith(
fontWeight:
FontWeight.normal,
fontStyle:
FontStyle.italic,
color:
Constant.textBlack,
fontSize: 14,
),
),
overflow: TextOverflow.ellipsis,
style: Constant.body1(
context: context)
.copyWith(
fontWeight: FontWeight.normal,
fontStyle: FontStyle.italic,
color: Constant.textBlack,
fontSize: 14,
Expanded(
child: Container(
child: Text(
' by : ' +
listSearchHistory
.value[idx]
.usertransaksi
.toString(),
overflow: TextOverflow
.ellipsis,
style: Constant.body1(
context:
context)
.copyWith(
fontWeight:
FontWeight
.normal,
fontStyle: FontStyle
.italic,
color: Constant
.pcBtnBackgroundColor,
fontSize: 14,
),
),
),
),
],
),
),
],