diff --git a/SpringTkApap/src/main/java/spring/TK/SpringTkApap/resep/rest/ResepRestController.java b/SpringTkApap/src/main/java/spring/TK/SpringTkApap/resep/rest/ResepRestController.java
index 1f178a56f56e44928fb8536a62b1d44bc359cee7..bc3bb5ac66bb6b6c0d30422afd3cecf39ace3c6c 100644
--- a/SpringTkApap/src/main/java/spring/TK/SpringTkApap/resep/rest/ResepRestController.java
+++ b/SpringTkApap/src/main/java/spring/TK/SpringTkApap/resep/rest/ResepRestController.java
@@ -24,13 +24,13 @@ public class ResepRestController {
ResepRestService resepRestService;
@PostMapping("/add/{kodeAppointment}")
- private ResponseEntity createResep(@RequestBody ResepDTO resep, BindingResult bindingResult, @PathVariable String kodeAppointment){
+ public ResponseEntity<Object> createResep(@RequestBody ResepDTO resep, BindingResult bindingResult, @PathVariable String kodeAppointment){
if (bindingResult.hasFieldErrors()) {
throw new ResponseStatusException(
HttpStatus.BAD_REQUEST, "Request body has invalid type or missing field."
);
} else {
- ResepModel resepModel = new ResepModel();
+ var resepModel = new ResepModel();
resepModel.setIsDone(resep.getIsDone());
resepModel.setCreatedAt(resep.getCreatedAt());
resepModel.setApoteker(resep.getApoteker());
diff --git a/tk_apap_flutter/lib/pages/CreateAppointment.dart b/tk_apap_flutter/lib/pages/CreateAppointment.dart
index 7f42d5c3202f145671a0f2f06741c4307e3b3d1a..6a7ba2aa55bf133f83a9b7e54733e412d61f0103 100644
--- a/tk_apap_flutter/lib/pages/CreateAppointment.dart
+++ b/tk_apap_flutter/lib/pages/CreateAppointment.dart
@@ -20,11 +20,7 @@ class _CreateAppointmentState extends State<CreateAppointment> {
// Data yang diperlukan tanggal dan waktu, dropdown [namaDokter - Tarif]
Future<List<Dokter>> getAllDoktor() async {
-<<<<<<< HEAD
- var uri = Uri.parse('http://10.0.2.2:8080/api/doktor/all');
-=======
- var uri = Uri.parse('http://192.168.1.2:8080/api/doktor/all');
->>>>>>> 043382a8d2493050d1fd9e4c42073c45da6a4ea9
+ var uri = Uri.parse('https://apap-053.cs.ui.ac.id/api/doktor/all');
dynamic token = await SessionManager().get('token');
String tknString = ('Bearer $token');
print(tknString);
@@ -107,11 +103,8 @@ class _CreateAppointmentState extends State<CreateAppointment> {
String strUsername = username;
var response = await http.post(
Uri.parse(
-<<<<<<< HEAD
- 'http://10.0.2.2:8080/api/appointment/create'),
-=======
- 'http://192.168.1.2:8080/api/appointment/create'),
->>>>>>> 043382a8d2493050d1fd9e4c42073c45da6a4ea9
+ 'https://apap-053.cs.ui.ac.id/api/appointment/create'),
+
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json; charset=UTF-8',
diff --git a/tk_apap_flutter/lib/pages/DaftarAppointment.dart b/tk_apap_flutter/lib/pages/DaftarAppointment.dart
index 5138fbd803f39580c3df695ab15f737a204f5314..8e16d1f03c127af417b6aa1c27bcac4b0a33b283 100644
--- a/tk_apap_flutter/lib/pages/DaftarAppointment.dart
+++ b/tk_apap_flutter/lib/pages/DaftarAppointment.dart
@@ -17,7 +17,7 @@ class DaftarAppointment extends StatefulWidget {
class _DaftarAppointmentState extends State<DaftarAppointment> {
Future<List<AptDTO>> getAppointment() async {
- var uri = Uri.parse('http://192.168.1.5:8080/api/appointment/all');
+ var uri = Uri.parse('https://apap-053.cs.ui.ac.id/api/appointment/all');
dynamic token = await SessionManager().get('token');
String tknString = ('Bearer $token');
http.Response response = await http.get(uri, headers: {
diff --git a/tk_apap_flutter/lib/pages/DetailAppointment.dart b/tk_apap_flutter/lib/pages/DetailAppointment.dart
index 8acc8bb20b6d3ff6fcab49c5f64b61cf9df419fc..b6ef90900d04286d88de081df151a476ea0b9709 100644
--- a/tk_apap_flutter/lib/pages/DetailAppointment.dart
+++ b/tk_apap_flutter/lib/pages/DetailAppointment.dart
@@ -16,7 +16,7 @@ class DetailAppointment extends StatelessWidget {
Future<DetailDTO> getDetailApt() async {
String kode = await SessionManager().get("kodeApt") as String;
- var uri = Uri.parse('http://192.168.1.5:8080/api/appointment/detail/$kode');
+ var uri = Uri.parse('https://apap-053.cs.ui.ac.id/api/appointment/detail/$kode');
dynamic token = await SessionManager().get("token");
String tknString = 'Bearer $token';
log("here");
@@ -100,7 +100,7 @@ class DetailAppointment extends StatelessWidget {
const SizedBox(height: 16,),
TextButton(
onPressed: (data.detailResep == 0) ? null : () {
- return Navigator.of(context).pushNamed(HomeScreen.routeName); // TODO: Ke Resep
+ return Navigator.of(context).pushNamed(HomeScreen.routeName);
},
child: (data.detailResep == 0) ? const Text('Tidak Ada Resep') : const Text('Detail Resep'),
),
diff --git a/tk_apap_flutter/lib/pages/HomeScreen.dart b/tk_apap_flutter/lib/pages/HomeScreen.dart
index 6ed3278fefb665e39cb5f7158083c9f3bd7f4658..19614cc5eff9054c688dbe3d7a5dca24bfe83012 100644
--- a/tk_apap_flutter/lib/pages/HomeScreen.dart
+++ b/tk_apap_flutter/lib/pages/HomeScreen.dart
@@ -310,7 +310,7 @@ class _HomeScreenState extends State<HomeScreen> {
}
}
- final List<Widget> _children = [ //TODO:ubah pages
+ final List<Widget> _children = [
HomeScreen(),
CreateAppointment(),
LihatProfil(),
diff --git a/tk_apap_flutter/lib/pages/LihatProfil.dart b/tk_apap_flutter/lib/pages/LihatProfil.dart
index 851a247a6cf9d9d20b6a93f0cec13cbb90765a3a..82b6b93170b8b38bafa968bb05e33597a6bb41eb 100644
--- a/tk_apap_flutter/lib/pages/LihatProfil.dart
+++ b/tk_apap_flutter/lib/pages/LihatProfil.dart
@@ -13,7 +13,7 @@ class LihatProfil extends StatelessWidget {
static const routeName = '/edit';
Future<PasienDTO> getPasien() async {
- var uri = Uri.parse('http://10.0.2.2:8080/api/pasien/getself');
+ var uri = Uri.parse('https://apap-053.cs.ui.ac.id/api/pasien/getself');
dynamic token = await SessionManager().get('token');
String tknString = ('Bearer $token');
http.Response response = await http.get(uri, headers: {
diff --git a/tk_apap_flutter/lib/pages/TopUpSaldo.dart b/tk_apap_flutter/lib/pages/TopUpSaldo.dart
index a8ab4f37986c04d04cebb835584544baed0deda6..4e96423256277edb564c0272651ff18e5204a74e 100644
--- a/tk_apap_flutter/lib/pages/TopUpSaldo.dart
+++ b/tk_apap_flutter/lib/pages/TopUpSaldo.dart
@@ -18,7 +18,7 @@ class TopUpSaldo extends StatelessWidget {
var textJumlahTopUp = TextEditingController();
Future<PasienDTO> getPasien() async {
- var uri = Uri.parse('http://10.0.2.2:8080/api/pasien/getself');
+ var uri = Uri.parse('https://apap-053.cs.ui.ac.id/api/pasien/getself');
dynamic token = await SessionManager().get('token');
String tknString = ('Bearer $token');
http.Response response = await http.get(uri, headers: {
@@ -303,7 +303,7 @@ class TopUpSaldo extends StatelessWidget {
String strUsername = username;
var response = await http.post(
Uri.parse(
- 'http://10.0.2.2:8080/api/pasien/top-up/' + strUsername),
+ 'https://apap-053.cs.ui.ac.id/api/pasien/top-up/' + strUsername),
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json; charset=UTF-8',
diff --git a/tk_apap_flutter/lib/pages/detailTagihan.dart b/tk_apap_flutter/lib/pages/detailTagihan.dart
index 28849d12aa8623412e411a9906566960a60da48f..ad563eb46a9a8b0f2a8fbc9866fe7c80296f78aa 100644
--- a/tk_apap_flutter/lib/pages/detailTagihan.dart
+++ b/tk_apap_flutter/lib/pages/detailTagihan.dart
@@ -15,7 +15,7 @@ class DetailTagihan extends StatelessWidget {
Future<TagihanDTO> getDetailTagihan() async {
String kode = await SessionManager().get("kodeTagihan") as String;
- var uri = Uri.parse('http://192.168.1.2:8080/api/tagihan/detail/$kode');
+ var uri = Uri.parse('https://apap-053.cs.ui.ac.id/api/tagihan/detail/$kode');
dynamic token = await SessionManager().get("token");
String tknString = 'Bearer $token';
log("here");
@@ -105,7 +105,7 @@ class DetailTagihan extends StatelessWidget {
dynamic kodeTagihan = await SessionManager().get("kodeTagihan");
var response = await http.post(
Uri.parse(
- 'http://192.168.1.2:8080/api/tagihan/bayar'),
+ 'https://apap-053.cs.ui.ac.id/api/tagihan/bayar'),
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json; charset=UTF-8',
diff --git a/tk_apap_flutter/lib/pages/login.dart b/tk_apap_flutter/lib/pages/login.dart
index bb5f597d465a6be616852fa942b68290dc106fa7..e5c105494b8edfe3a5e5802e73f1cd12885995e6 100644
--- a/tk_apap_flutter/lib/pages/login.dart
+++ b/tk_apap_flutter/lib/pages/login.dart
@@ -24,14 +24,10 @@ class _LoginState extends State<Login> {
final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
UserLogin user = UserLogin("", "");
bool _isHidden = true;
-<<<<<<< HEAD
final url = Uri.parse(
- 'http://10.0.2.2:8080/api/authenticate'); //TODO:ubah sesuai IP Address, nanti pakai link web
+ 'https://apap-053.cs.ui.ac.id/api/authenticate');
-=======
- final url = Uri.parse('http://192.168.1.2:8080/api/authenticate'); //TODO:ubah sesuai IP Address, nanti pakai link web
->>>>>>> 043382a8d2493050d1fd9e4c42073c45da6a4ea9
final header = <String, String>{
'Content-Type': 'application/json; charset=UTF-8'
};
@@ -51,7 +47,6 @@ class _LoginState extends State<Login> {
Map<String, dynamic> jsonResponse = await stringToMap(json);
print(jsonResponse);
if (jsonResponse["role"] == "PASIEN") {
- // TODO: PASIEN
saveSession(jsonResponse);
Navigator.of(context).pushReplacementNamed(HomeScreen.routeName);
} else {
diff --git a/tk_apap_flutter/lib/pages/register.dart b/tk_apap_flutter/lib/pages/register.dart
index c9c032e612114638955a336351f88ba55015d3eb..c42b9e49a600b7df3c49c0a43017124ce7fb2f56 100644
--- a/tk_apap_flutter/lib/pages/register.dart
+++ b/tk_apap_flutter/lib/pages/register.dart
@@ -224,7 +224,7 @@ class _RegisterState extends State<Register> {
if (_formKey.currentState.validate()) {
var response = await http.post(
Uri.parse(
- 'http://10.0.2.2:8080/api/pasien/register'),
+ 'https://apap-053.cs.ui.ac.id/api/pasien/register'),
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json'},
diff --git a/tk_apap_flutter/lib/pages/tagihan.dart b/tk_apap_flutter/lib/pages/tagihan.dart
index ea6f461cf72369364a547f540bb0794a63010869..8df7ae0754e1804aea1970517e24ee44d8eddd94 100644
--- a/tk_apap_flutter/lib/pages/tagihan.dart
+++ b/tk_apap_flutter/lib/pages/tagihan.dart
@@ -20,7 +20,7 @@ class DaftarTagihan extends StatefulWidget {
class _DaftarTagihanState extends State<DaftarTagihan> {
Future<List<TagihanDTO>> getTagihan() async {
- var uri = Uri.parse('http://192.168.1.2:8080/api/tagihan/all');
+ var uri = Uri.parse('https://apap-053.cs.ui.ac.id/api/tagihan/all');
dynamic token = await SessionManager().get('token');
String tknString = ('Bearer $token');
http.Response response = await http.get(uri,
diff --git a/tk_apap_flutter/lib/widgets/drawerWidget.dart b/tk_apap_flutter/lib/widgets/drawerWidget.dart
index 10e08528ff04ee5f42c2a804629106aace7c698e..f1011fd69a8f96ac30ddd68b800c0dfbb33a8aa4 100644
--- a/tk_apap_flutter/lib/widgets/drawerWidget.dart
+++ b/tk_apap_flutter/lib/widgets/drawerWidget.dart
@@ -118,7 +118,7 @@ class CustomDrawer extends StatelessWidget {
color: Colors.black
),),
onTap: () {
- Navigator.of(context).pushNamed(DaftarTagihan.routeName); // TODO: ubah tagihan
+ Navigator.of(context).pushNamed(DaftarTagihan.routeName);
},
),
ListTile(