From 18023f1947ef0f11f08a6c51851b80ed17bec57a Mon Sep 17 00:00:00 2001
From: Greg <gregorius.farel@ui.ac.id>
Date: Mon, 12 Dec 2022 09:07:22 +0700
Subject: [PATCH 1/2] pull
---
.../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes
.../.gradle/7.5.1/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes
.../buildOutputCleanup.lock | Bin 17 -> 17 bytes
.../lib/tagihan/TagihanModel.dart | 27 ++++++++++++------
rumahSehat_mobile/lib/url_settings.dart | 2 +-
5 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/rumahSehat_jwt/.gradle/7.5.1/executionHistory/executionHistory.lock b/rumahSehat_jwt/.gradle/7.5.1/executionHistory/executionHistory.lock
index 2b13301660eb7857f5cc7fa8757f5051cbf83bb5..b8ad173ea5de609ad94eb96f0a02d6e512b4d699 100644
GIT binary patch
literal 17
UcmZRcJVQ~p{l)(?3=oh7060qpApigX
literal 17
UcmZRcJVQ~p{l)(?3=ohG060hm9smFU
diff --git a/rumahSehat_jwt/.gradle/7.5.1/fileHashes/fileHashes.lock b/rumahSehat_jwt/.gradle/7.5.1/fileHashes/fileHashes.lock
index 6ff0174a6b2f5f25e6d817b35ea6222ae5240592..db218bd2913d62ed183f5a477c3942b660810e5e 100644
GIT binary patch
literal 17
VcmZS1OYnTqB){%90~j!R001&r1a1HT
literal 17
VcmZS1OYnTqB){%90~j!h0st~41Umo#
diff --git a/rumahSehat_jwt/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/rumahSehat_jwt/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 6195b8237aba9841380f4ac7e16e9e5890fb2145..3f37e5d951ec1db14d3b2941aa7147184627a98d 100644
GIT binary patch
literal 17
UcmZSnbYdHCS<KZ93=mKW06s7UQ2+n{
literal 17
UcmZSnbYdHCS<KZ93=mKZ06r=OO8@`>
diff --git a/rumahSehat_mobile/lib/tagihan/TagihanModel.dart b/rumahSehat_mobile/lib/tagihan/TagihanModel.dart
index a471446..75c9905 100644
--- a/rumahSehat_mobile/lib/tagihan/TagihanModel.dart
+++ b/rumahSehat_mobile/lib/tagihan/TagihanModel.dart
@@ -2,7 +2,7 @@
class TagihanModel {
final String kode;
final String tanggalTerbuat;
- final String tanggalBayar;
+ final String? tanggalBayar;
final bool isPaid;
final int jumlahTagihan;
@@ -15,12 +15,23 @@ class TagihanModel {
});
factory TagihanModel.fromJson(Map<String, dynamic> json) {
- return TagihanModel(
- kode: json['kode'],
- tanggalTerbuat: json['tanggalTerbuat'],
- tanggalBayar: json['tanggalBayar'],
- isPaid: json['isPaid'],
- jumlahTagihan: json['jumlahTagihan'],
- );
+ if(json['tanggalBayar'] == null) {
+ return TagihanModel(
+ kode: json['kode'],
+ tanggalTerbuat: json['tanggalTerbuat'],
+ tanggalBayar: null,
+ isPaid: json['isPaid'],
+ jumlahTagihan: json['jumlahTagihan'],
+ );
+ } else {
+ return TagihanModel(
+ kode: json['kode'],
+ tanggalTerbuat: json['tanggalTerbuat'],
+ tanggalBayar: json['tanggalBayar'],
+ isPaid: json['isPaid'],
+ jumlahTagihan: json['jumlahTagihan'],
+ );
+ }
+
}
}
diff --git a/rumahSehat_mobile/lib/url_settings.dart b/rumahSehat_mobile/lib/url_settings.dart
index 83b8257..fb3c100 100644
--- a/rumahSehat_mobile/lib/url_settings.dart
+++ b/rumahSehat_mobile/lib/url_settings.dart
@@ -1,4 +1,4 @@
-const String base_url = "http://192.168.0.104:8081/api";
+const String base_url = "http://192.168.100.47:8081/api";
const String appointment_url = base_url + "/appointment";
const String resep_url = base_url + "/appointment";
--
GitLab
From 209368ce00ca259c1020f55b3404618ff0bef0c4 Mon Sep 17 00:00:00 2001
From: Greg <gregorius.farel@ui.ac.id>
Date: Mon, 12 Dec 2022 09:38:39 +0700
Subject: [PATCH 2/2] feat: fix TagihanModel.dart - 2
---
.../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes
.../.gradle/7.5.1/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes
.../buildOutputCleanup/buildOutputCleanup.lock | Bin 17 -> 17 bytes
.../service/TagihanServiceImpl.java | 2 ++
.../lib/tagihan/view_detail_tagihan.dart | 16 ++++++++++------
5 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/rumahSehat_jwt/.gradle/7.5.1/executionHistory/executionHistory.lock b/rumahSehat_jwt/.gradle/7.5.1/executionHistory/executionHistory.lock
index b8ad173ea5de609ad94eb96f0a02d6e512b4d699..aeba4225130e44972dcc1bd3dad0561b316fc40b 100644
GIT binary patch
literal 17
UcmZRcJVQ~p{l)(?3=mKN060+vCjbBd
literal 17
UcmZRcJVQ~p{l)(?3=oh7060qpApigX
diff --git a/rumahSehat_jwt/.gradle/7.5.1/fileHashes/fileHashes.lock b/rumahSehat_jwt/.gradle/7.5.1/fileHashes/fileHashes.lock
index db218bd2913d62ed183f5a477c3942b660810e5e..0eb411740d861e6d39fdd48c3839e27ec8b3ab85 100644
GIT binary patch
literal 17
VcmZS1OYnTqB){%90~j#w0su0~1mFMw
literal 17
VcmZS1OYnTqB){%90~j!R001&r1a1HT
diff --git a/rumahSehat_jwt/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/rumahSehat_jwt/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 3f37e5d951ec1db14d3b2941aa7147184627a98d..3f22ea9f2b1aa3341651ca2c0048ddc3688e72c7 100644
GIT binary patch
literal 17
UcmZSnbYdHCS<KZ93=q%?06shgT>t<8
literal 17
UcmZSnbYdHCS<KZ93=mKW06s7UQ2+n{
diff --git a/rumahSehat_jwt/src/main/java/apap/tk/rumahSehat_jwt/service/TagihanServiceImpl.java b/rumahSehat_jwt/src/main/java/apap/tk/rumahSehat_jwt/service/TagihanServiceImpl.java
index 48c0162..05cb085 100644
--- a/rumahSehat_jwt/src/main/java/apap/tk/rumahSehat_jwt/service/TagihanServiceImpl.java
+++ b/rumahSehat_jwt/src/main/java/apap/tk/rumahSehat_jwt/service/TagihanServiceImpl.java
@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.transaction.Transactional;
+import java.time.LocalDateTime;
import java.util.List;
@Service
@@ -43,6 +44,7 @@ public class TagihanServiceImpl {
pasienModel.setSaldo(saldo - jumlahTagihan);
pasienDb.save(pasienModel);
tagihanModel.setIsPaid(true);
+ tagihanModel.setTanggalBayar(LocalDateTime.now());
return tagihanDb.save(tagihanModel);
} else {
return tagihanModel;
diff --git a/rumahSehat_mobile/lib/tagihan/view_detail_tagihan.dart b/rumahSehat_mobile/lib/tagihan/view_detail_tagihan.dart
index 837f6c5..dbb1e43 100644
--- a/rumahSehat_mobile/lib/tagihan/view_detail_tagihan.dart
+++ b/rumahSehat_mobile/lib/tagihan/view_detail_tagihan.dart
@@ -24,8 +24,7 @@ class TagihanDetailScreen extends StatelessWidget{
centerTitle: true,
leading: IconButton(icon: Icon(Icons.arrow_back_ios), onPressed: ()
{
- Navigator.pushNamed(
- context, HomeScreen.routeName);
+ Navigator.pop(context);
},),
),
body: Column(
@@ -46,7 +45,7 @@ class TagihanDetailScreen extends StatelessWidget{
sizedBox,
TagihanFieldRow(field: 'Tanggal Terbuat', value: convertTanggal(tagihanToView.tanggalTerbuat)),
sizedBox,
- TagihanFieldRow(field: 'Tanggal Bayar', value: convertTanggal(tagihanToView.tanggalTerbuat)),
+ TagihanFieldRow(field: 'Tanggal Bayar', value: convertTanggal(tagihanToView.tanggalBayar)),
sizedBox,
TagihanFieldRow(field: 'Status', value: getStatus(tagihanToView.isPaid)),
sizedBox,
@@ -70,9 +69,14 @@ class TagihanDetailScreen extends StatelessWidget{
}
}
-String convertTanggal(String dateTime) {
- String tanggal = dateTime.substring(0,10);
- return tanggal;
+String convertTanggal(String? dateTime) {
+ if (dateTime == null) {
+ return "Belum Dibayar";
+
+ } else {
+ String tanggal = dateTime.substring(0,10);
+ return tanggal;
+ }
}
String getStatus(bool isPaid) {
--
GitLab