Fakultas Ilmu Komputer UI

Commit 5cd40612 authored by Habel Christiando Tobing's avatar Habel Christiando Tobing
Browse files

resolving conflict

parents 938d12e3 cb4acebb
......@@ -710,7 +710,7 @@
"languageVersion": "2.7"
}
],
"generated": "2021-06-27T18:41:55.631727Z",
"generated": "2021-06-28T08:19:42.411403Z",
"generator": "pub",
"generatorVersion": "2.12.0"
}
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_keyboard_visibility","path":"D:\\\\Program Files\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_keyboard_visibility-5.0.0\\\\","dependencies":[]},{"name":"flutter_secure_storage","path":"D:\\\\Program Files\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_secure_storage-3.3.5\\\\","dependencies":[]},{"name":"image_picker","path":"D:\\\\Program Files\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\image_picker-0.7.4\\\\","dependencies":[]},{"name":"path_provider","path":"D:\\\\Program Files\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-2.0.1\\\\","dependencies":[]}],"android":[{"name":"flutter_keyboard_visibility","path":"D:\\\\Program Files\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_keyboard_visibility-5.0.0\\\\","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","path":"D:\\\\Program Files\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_plugin_android_lifecycle-2.0.1\\\\","dependencies":[]},{"name":"flutter_secure_storage","path":"D:\\\\Program Files\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_secure_storage-3.3.5\\\\","dependencies":[]},{"name":"image_picker","path":"D:\\\\Program Files\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\image_picker-0.7.4\\\\","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"path_provider","path":"D:\\\\Program Files\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-2.0.1\\\\","dependencies":[]}],"macos":[{"name":"path_provider_macos","path":"D:\\\\Program Files\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_macos-2.0.0\\\\","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"D:\\\\Program Files\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_linux-2.0.0\\\\","dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"D:\\\\Program Files\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_windows-2.0.0\\\\","dependencies":[]}],"web":[{"name":"flutter_keyboard_visibility_web","path":"D:\\\\Program Files\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_keyboard_visibility_web-2.0.0\\\\","dependencies":[]},{"name":"image_picker_for_web","path":"D:\\\\Program Files\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\image_picker_for_web-2.0.0\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"flutter_keyboard_visibility","dependencies":["flutter_keyboard_visibility_web"]},{"name":"flutter_keyboard_visibility_web","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"flutter_secure_storage","dependencies":[]},{"name":"image_picker","dependencies":["flutter_plugin_android_lifecycle","image_picker_for_web"]},{"name":"image_picker_for_web","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux","path_provider_windows"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2021-06-28 14:48:16.707124","version":"2.0.1"}
\ No newline at end of file
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_keyboard_visibility","path":"D:\\\\Program Files\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_keyboard_visibility-5.0.0\\\\","dependencies":[]},{"name":"flutter_secure_storage","path":"D:\\\\Program Files\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_secure_storage-3.3.5\\\\","dependencies":[]},{"name":"image_picker","path":"D:\\\\Program Files\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\image_picker-0.7.4\\\\","dependencies":[]},{"name":"path_provider","path":"D:\\\\Program Files\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-2.0.1\\\\","dependencies":[]}],"android":[{"name":"flutter_keyboard_visibility","path":"D:\\\\Program Files\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_keyboard_visibility-5.0.0\\\\","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","path":"D:\\\\Program Files\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_plugin_android_lifecycle-2.0.1\\\\","dependencies":[]},{"name":"flutter_secure_storage","path":"D:\\\\Program Files\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_secure_storage-3.3.5\\\\","dependencies":[]},{"name":"image_picker","path":"D:\\\\Program Files\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\image_picker-0.7.4\\\\","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"path_provider","path":"D:\\\\Program Files\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-2.0.1\\\\","dependencies":[]}],"macos":[{"name":"path_provider_macos","path":"D:\\\\Program Files\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_macos-2.0.0\\\\","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"D:\\\\Program Files\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_linux-2.0.0\\\\","dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"D:\\\\Program Files\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_windows-2.0.0\\\\","dependencies":[]}],"web":[{"name":"flutter_keyboard_visibility_web","path":"D:\\\\Program Files\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_keyboard_visibility_web-2.0.0\\\\","dependencies":[]},{"name":"image_picker_for_web","path":"D:\\\\Program Files\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\image_picker_for_web-2.0.0\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"flutter_keyboard_visibility","dependencies":["flutter_keyboard_visibility_web"]},{"name":"flutter_keyboard_visibility_web","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"flutter_secure_storage","dependencies":[]},{"name":"image_picker","dependencies":["flutter_plugin_android_lifecycle","image_picker_for_web"]},{"name":"image_picker_for_web","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux","path_provider_windows"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2021-06-28 15:19:42.868070","version":"2.0.1"}
\ No newline at end of file
......@@ -3,7 +3,7 @@
#
# For more info see: https://dart.dev/go/dot-packages-deprecation
#
# Generated by pub on 2021-06-28 01:41:55.602446.
# Generated by pub on 2021-06-28 15:19:42.286940.
_fe_analyzer_shared:file:///D:/Program%20Files/flutter/.pub-cache/hosted/pub.dartlang.org/_fe_analyzer_shared-14.0.0/lib/
analyzer:file:///D:/Program%20Files/flutter/.pub-cache/hosted/pub.dartlang.org/analyzer-0.41.2/lib/
args:file:///D:/Program%20Files/flutter/.pub-cache/hosted/pub.dartlang.org/args-2.0.0/lib/
......
// This is a generated file; do not edit or check into version control.
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
FLUTTER_ROOT=/Users/ferdisungkar/flutter
FLUTTER_APPLICATION_PATH=/Users/ferdisungkar/Desktop/Files/Universitas-Indonesia/Semester-6/PPL/Project/ppl2021-d-slhape
FLUTTER_TARGET=/Users/ferdisungkar/Desktop/Files/Universitas-Indonesia/Semester-6/PPL/Project/ppl2021-d-slhape/lib/main.dart
=======
FLUTTER_ROOT=C:\flutter\flutter
FLUTTER_APPLICATION_PATH=E:\Fasilkom\Semester 6\Proyek Perangkat Lunak\biodata2\ppl2021-d-slhape
FLUTTER_TARGET=lib\main.dart
>>>>>>> aec21a9964e4c1cd3acf319fb5854abd153112cb
=======
FLUTTER_ROOT=C:\flutter\flutter
FLUTTER_APPLICATION_PATH=E:\Fasilkom\Semester 6\Proyek Perangkat Lunak\biodata2\ppl2021-d-slhape
FLUTTER_TARGET=lib\main.dart
=======
FLUTTER_ROOT=/Users/ferdisungkar/flutter
FLUTTER_APPLICATION_PATH=/Users/ferdisungkar/Desktop/Files/Universitas-Indonesia/Semester-6/PPL/Project/ppl2021-d-slhape
FLUTTER_TARGET=/Users/ferdisungkar/Desktop/Files/Universitas-Indonesia/Semester-6/PPL/Project/ppl2021-d-slhape/lib/main.dart
>>>>>>> 91daa656c5e94ce17276f720ff6972311abf7c69
>>>>>>> 0b764942660bfa83f5e9ea7e682f8641f77f4063
=======
FLUTTER_ROOT=C:\flutter\flutter
FLUTTER_APPLICATION_PATH=E:\Fasilkom\Semester 6\Proyek Perangkat Lunak\biodata2\ppl2021-d-slhape
FLUTTER_TARGET=lib\main.dart
>>>>>>> 6ba140add67633bd5eaa17ae4e8115b8878ee220
=======
FLUTTER_ROOT=/Users/ferdisungkar/flutter
FLUTTER_APPLICATION_PATH=/Users/ferdisungkar/Desktop/Files/Universitas-Indonesia/Semester-6/PPL/Project/ppl2021-d-slhape
FLUTTER_TARGET=/Users/ferdisungkar/Desktop/Files/Universitas-Indonesia/Semester-6/PPL/Project/ppl2021-d-slhape/lib/main.dart
>>>>>>> a454bc5e5a6e63095408b4322e7350020f1ab114
FLUTTER_BUILD_DIR=build
SYMROOT=${SOURCE_ROOT}/../build/ios
FLUTTER_BUILD_NAME=1.0.0
......
#!/bin/sh
# This is a generated file; do not edit or check into version control.
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
export "FLUTTER_ROOT=/Users/ferdisungkar/flutter"
export "FLUTTER_APPLICATION_PATH=/Users/ferdisungkar/Desktop/Files/Universitas-Indonesia/Semester-6/PPL/Project/ppl2021-d-slhape"
export "FLUTTER_TARGET=/Users/ferdisungkar/Desktop/Files/Universitas-Indonesia/Semester-6/PPL/Project/ppl2021-d-slhape/lib/main.dart"
=======
export "FLUTTER_ROOT=C:\flutter\flutter"
export "FLUTTER_APPLICATION_PATH=E:\Fasilkom\Semester 6\Proyek Perangkat Lunak\biodata2\ppl2021-d-slhape"
export "FLUTTER_TARGET=lib\main.dart"
>>>>>>> aec21a9964e4c1cd3acf319fb5854abd153112cb
=======
export "FLUTTER_ROOT=C:\flutter\flutter"
export "FLUTTER_APPLICATION_PATH=E:\Fasilkom\Semester 6\Proyek Perangkat Lunak\biodata2\ppl2021-d-slhape"
export "FLUTTER_TARGET=lib\main.dart"
=======
export "FLUTTER_ROOT=/Users/ferdisungkar/flutter"
export "FLUTTER_APPLICATION_PATH=/Users/ferdisungkar/Desktop/Files/Universitas-Indonesia/Semester-6/PPL/Project/ppl2021-d-slhape"
export "FLUTTER_TARGET=/Users/ferdisungkar/Desktop/Files/Universitas-Indonesia/Semester-6/PPL/Project/ppl2021-d-slhape/lib/main.dart"
>>>>>>> 91daa656c5e94ce17276f720ff6972311abf7c69
>>>>>>> 0b764942660bfa83f5e9ea7e682f8641f77f4063
=======
export "FLUTTER_ROOT=C:\flutter\flutter"
export "FLUTTER_APPLICATION_PATH=E:\Fasilkom\Semester 6\Proyek Perangkat Lunak\biodata2\ppl2021-d-slhape"
export "FLUTTER_TARGET=lib\main.dart"
>>>>>>> 6ba140add67633bd5eaa17ae4e8115b8878ee220
=======
export "FLUTTER_ROOT=/Users/ferdisungkar/flutter"
export "FLUTTER_APPLICATION_PATH=/Users/ferdisungkar/Desktop/Files/Universitas-Indonesia/Semester-6/PPL/Project/ppl2021-d-slhape"
export "FLUTTER_TARGET=/Users/ferdisungkar/Desktop/Files/Universitas-Indonesia/Semester-6/PPL/Project/ppl2021-d-slhape/lib/main.dart"
>>>>>>> a454bc5e5a6e63095408b4322e7350020f1ab114
export "FLUTTER_BUILD_DIR=build"
export "SYMROOT=${SOURCE_ROOT}/../build/ios"
export "FLUTTER_BUILD_NAME=1.0.0"
......
This diff is collapsed.
class EquityBanners {
List<Map<String, String>> bannerList;
EquityBanners({this.bannerList});
factory EquityBanners.fromJson(Map<String, String> jsonData) {
var list = jsonData['offering_banners'] as List;
List<Map<String, String>> bannerList = list;
return EquityBanners(bannerList: bannerList);
}
List<Map<String, String>> getBannerList() {
return this.bannerList;
}
}
This diff is collapsed.
This diff is collapsed.
......@@ -4,6 +4,9 @@ import 'package:fundex_app/assets/colors.dart';
import 'package:flutter_typeahead/flutter_typeahead.dart';
import 'package:fundex_app/pages/business/homekyc.dart';
import 'package:fundex_app/pages/kyc/alamat_body.dart';
import 'package:fundex_app/pages/kyc/biodata_keluarga_body.dart';
import 'package:fundex_app/pages/kyc/biodata_pendukung.dart';
import 'package:fundex_app/pages/kyc/data_identitas.dart';
import 'package:fundex_app/pages/kyc/design.dart';
import 'package:intl/intl.dart';
......@@ -88,6 +91,11 @@ class _BiodataBodyState extends State<BiodataBody> {
bool alreadyFilledSection = false;
DateTime date;
String strDate;
var valStep1;
var valStep2;
var valStep3;
var valStep4;
var valStep5;
double opacityRadio = 0;
void initState() {
......@@ -143,9 +151,18 @@ class _BiodataBodyState extends State<BiodataBody> {
idKYC = map['id'];
var val = (map)['attribute_value'];
var str = val.substring(1, val.length - 1);
var step3 = str.split(",")[2];
var step1 = str.split(",")[0];
var value = step1.substring(8);
if (value == "true") {
var step2 = str.split(",")[1];
var step4 = str.split(",")[3];
var step5 = str.split(",")[4];
valStep3 = step3.substring(8);
valStep1 = step1.substring(8);
valStep2 = step2.substring(8);
valStep4 = step4.substring(8);
valStep5 = step5.substring(8);
print("step 5 = " +valStep5);
if (valStep1 == "true") {
setState(() {
alreadyFilledSection = true;
});
......@@ -160,6 +177,7 @@ class _BiodataBodyState extends State<BiodataBody> {
phone = json['phone'];
city = jsonCity;
setState(() {
this.id = id;
this.email = email;
......@@ -287,6 +305,7 @@ class _BiodataBodyState extends State<BiodataBody> {
),
//buletan
valStep2 == "false" ?
Container(
height: 24,
width: 24,
......@@ -299,7 +318,25 @@ class _BiodataBodyState extends State<BiodataBody> {
borderRadius:
BorderRadius.circular(100),
),
),
)
: Container(
height: 24,
width: 24,
decoration: BoxDecoration(
color: primary,
borderRadius:
BorderRadius.circular(100)),
child: IconButton(
icon: Icon(Icons.check_outlined,
color: white,
size: 16),
onPressed: () {
Navigator.push(context, MaterialPageRoute(builder: (context) {
return AlamatBody();
}));
},
),
),
//garis
Container(
......@@ -309,6 +346,7 @@ class _BiodataBodyState extends State<BiodataBody> {
),
//buletan
valStep3 == "false" ?
Container(
height: 24,
width: 24,
......@@ -321,7 +359,25 @@ class _BiodataBodyState extends State<BiodataBody> {
borderRadius:
BorderRadius.circular(100),
),
),
)
: Container(
height: 24,
width: 24,
decoration: BoxDecoration(
color: primary,
borderRadius:
BorderRadius.circular(100)),
child: IconButton(
icon: Icon(Icons.check_outlined,
color: white,
size: 16),
onPressed: () {
Navigator.push(context, MaterialPageRoute(builder: (context) {
return BiodataKeluarga();
}));
},
),
),
//garis
Container(
......@@ -331,6 +387,7 @@ class _BiodataBodyState extends State<BiodataBody> {
),
//buletan
valStep4 == "false" ?
Container(
height: 24,
width: 24,
......@@ -343,7 +400,25 @@ class _BiodataBodyState extends State<BiodataBody> {
borderRadius:
BorderRadius.circular(100),
),
),
)
: Container(
height: 24,
width: 24,
decoration: BoxDecoration(
color: primary,
borderRadius:
BorderRadius.circular(100)),
child: IconButton(
icon: Icon(Icons.check_outlined,
color: white,
size: 16),
onPressed: () {
Navigator.push(context, MaterialPageRoute(builder: (context) {
return DataIdentitas();
}));
},
),
),
//garis
Container(
......@@ -353,6 +428,7 @@ class _BiodataBodyState extends State<BiodataBody> {
),
//buletan
valStep5 == "false" ?
Container(
height: 24,
width: 24,
......@@ -365,7 +441,25 @@ class _BiodataBodyState extends State<BiodataBody> {
borderRadius:
BorderRadius.circular(100),
),
),
)
: Container(
height: 24,
width: 24,
decoration: BoxDecoration(
color: primary,
borderRadius:
BorderRadius.circular(100)),
child: IconButton(
icon: Icon(Icons.check_outlined,
color: white,
size: 16),
onPressed: () {
Navigator.push(context, MaterialPageRoute(builder: (context) {
return DataPendukung();
}));
},
),
),
],
),
),
......@@ -783,9 +877,13 @@ class _BiodataBodyState extends State<BiodataBody> {
} else {
print(
"button Selanjutnya masuk POST");
Api().gender(jenisKelamin);
Api().birthplace(kota);
Api().birthdate(strDate);
Api().gender(jenisKelamin, idGender);
// print(jenisKelamin);
Api().birthplace(kota, idbirthplace);
print(kota);
Api().birthdate(strDate, idbirthdate);
print(strDate);
Api().kyc_progress(
true, false, false, false, false);
}
......
import 'package:flutter/material.dart';
import 'package:fundex_app/api/api.dart';
import 'package:fundex_app/assets/colors.dart';
import 'package:fundex_app/pages/business/homekyc.dart';
import 'package:fundex_app/pages/kyc/alamat_body.dart';
import 'package:fundex_app/pages/kyc/biodata_body.dart';
import 'package:fundex_app/pages/kyc/biodata_pendukung.dart';
import 'package:fundex_app/pages/kyc/data_identitas.dart';
import 'package:fundex_app/pages/kyc/design.dart';
......@@ -56,6 +59,11 @@ class _BiodataKeluargaBodyState extends State<BiodataKeluarga> {
String statusPernikahan;
double opacityRadio = 0;
bool alreadyFilledSection = false;
var valStep1;
var valStep2;
var valStep3;
var valStep4;
var valStep5;
void initState() {
super.initState();
......@@ -125,9 +133,17 @@ class _BiodataKeluargaBodyState extends State<BiodataKeluarga> {
idKYC = map['id'];
var val = map['attribute_value'];
var str = val.substring(1, val.length - 1);
var step1 = str.split(",")[2];
var value = step1.substring(8);
if (value == "true") {
var step3 = str.split(",")[2];
var step1 = str.split(",")[0];
var step2 = str.split(",")[1];
var step4 = str.split(",")[3];
var step5 = str.split(",")[4];
valStep3 = step3.substring(8);
valStep1 = step1.substring(8);
valStep2 = step2.substring(8);
valStep4 = step4.substring(8);
valStep5 = step5.substring(8);
if (valStep3 == "true") {
setState(() {
alreadyFilledSection = true;
});
......@@ -179,7 +195,9 @@ class _BiodataKeluargaBodyState extends State<BiodataKeluarga> {
color: primary,
),
onPressed: () {
Navigator.pop(context);
Navigator.push(context, MaterialPageRoute(builder: (context) {
return HomeKYC();
}));
}),
Text('e-KYC Pemodal', style: titleTextStyle()),
],
......@@ -206,19 +224,38 @@ class _BiodataKeluargaBodyState extends State<BiodataKeluarga> {
child: Row(
children: <Widget>[
//buletan
Container(
height: 24,
width: 24,
decoration: BoxDecoration(
color: primary,
valStep1 == "false" ?
Container(
height: 24,
width: 24,
decoration: BoxDecoration(
border: Border.all(
width: 2,
style: BorderStyle.solid,
color: primary,
),
borderRadius:
BorderRadius.circular(100)),
child: Icon(
Icons.check_outlined,
color: white,
size: 16,
),
),
BorderRadius.circular(100),
),
)
: Container(
height: 24,
width: 24,
decoration: BoxDecoration(
color: primary,
borderRadius:
BorderRadius.circular(100)),
child: IconButton(
icon: Icon(Icons.check_outlined,
color: white,
size: 16),
onPressed: () {
Navigator.push(context, MaterialPageRoute(builder: (context) {
return BiodataBody();
}));
},
),
),
//garis
Container(
......@@ -228,19 +265,38 @@ class _BiodataKeluargaBodyState extends State<BiodataKeluarga> {
),
//buletan
Container(
height: 24,
width: 24,
decoration: BoxDecoration(
color: primary,
valStep2 == "false" ?
Container(
height: 24,
width: 24,
decoration: BoxDecoration(
border: Border.all(
width: 2,
style: BorderStyle.solid,
color: primary,
),
borderRadius:
BorderRadius.circular(100)),
child: Icon(
Icons.check_outlined,
color: white,
size: 16,
),
),
BorderRadius.circular(100),
),
)
: Container(
height: 24,
width: 24,
decoration: BoxDecoration(
color: primary,
borderRadius:
BorderRadius.circular(100)),
child: IconButton(
icon: Icon(Icons.check_outlined,
color: white,
size: 16),
onPressed: () {
Navigator.push(context, MaterialPageRoute(builder: (context) {
return AlamatBody();
}));
},
),
),
//garis
Container(
......@@ -272,18 +328,38 @@ class _BiodataKeluargaBodyState extends State<BiodataKeluarga> {
),
//buletan
Container(
height: 24,
width: 24,
decoration: BoxDecoration(
valStep4 == "false" ?
Container(
height: 24,
width: 24,
decoration: BoxDecoration(
border: Border.all(
width: 2,
style: BorderStyle.solid,
color: primary,
),
borderRadius:
BorderRadius.circular(100)),
),
BorderRadius.circular(100),
),
)
: Container(
height: 24,
width: 24,
decoration: BoxDecoration(
color: primary,
borderRadius:
BorderRadius.circular(100)),
child: IconButton(
icon: Icon(Icons.check_outlined,
color: white,
size: 16),
onPressed: () {
Navigator.push(context, MaterialPageRoute(builder: (context) {
return DataIdentitas();
}));
},
),
),
//garis
Container(
......@@ -293,18 +369,38 @@ class _BiodataKeluargaBodyState extends State<BiodataKeluarga> {
),
//buletan
Container(
height: 24,
width: 24,
decoration: BoxDecoration(
valStep5 == "false" ?
Container(
height: 24,
width: 24,
decoration: BoxDecoration(
border: Border.all(
width: 2,
style: BorderStyle.solid,
color: primary,
),
borderRadius:
BorderRadius.circular(100)),
),
BorderRadius.circular(100),
),
)
: Container(
height: 24,
width: 24,
decoration: BoxDecoration(
color: primary,
borderRadius:
BorderRadius.circular(100)),
child: IconButton(
icon: Icon(Icons.check_outlined,
color: white,
size: 16),
onPressed: () {
Navigator.push(context, MaterialPageRoute(builder: (context) {
return DataPendukung();
}));
},
),
),
],
),
),
......@@ -770,8 +866,8 @@ class _BiodataKeluargaBodyState extends State<BiodataKeluarga> {
Api().heir_relation(_hubunganAhli);
Api().heir_phone(_nomorHandphone);
Api().heir_address(_alamatAhli);
Api().put_kyc_progress(idKYC, true,
true, true, false, false);
Api().kyc_progress(
true, true, true, false, false);
}
Navigator.push(context,
......
This diff is collapsed.
This diff is collapsed.
import 'transaksi.dart';
class EquityPurchased {
List<Transaksi> transaksiList;
EquityPurchased({this.transaksiList});
factory EquityPurchased.fromJson(Map<String, dynamic> jsonData) {
var list = jsonData['equity_purchased'] as List;
List<Transaksi> transaksiLists =
list.map((i) => Transaksi.fromJson(i