Skip to content

Commit

Permalink
Merge pull request #99 from fleetimee/fixing_form
Browse files Browse the repository at this point in the history
  • Loading branch information
@fleetimee
fleetimee authored Nov 27, 2022
2 parents 887c0f7 + 4110904 commit b39a015
Show file tree
Hide file tree
Showing 23 changed files with 988 additions and 296 deletions.
2 changes: 1 addition & 1 deletion lib/app/data/provider/debitur/list_debitur.provider.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class ListDebiturProvider {
try {
final response = await httpClient.get(
Uri.parse(
'${baseUrl}debiturs?page=$page&limit=5&sort=$sort&fields=$field&join=inputKeuangan||kredit_diusulkan,digunakan_untuk'),
'${baseUrl}debiturs?page=$page&limit=15&sort=$sort&fields=$field&join=inputKeuangan||kredit_diusulkan,digunakan_untuk'),
headers: {
'Content-Type': 'application/json',
'Accept': 'application/json',
Expand Down
463 changes: 245 additions & 218 deletions lib/app/modules/agunan_analisis_calc/views/agunan_analisis_calc_view.dart
View file

Large diffs are not rendered by default.

35 changes: 34 additions & 1 deletion lib/app/modules/asuransi/views/asuransi_view.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
import 'package:extended_masked_text/extended_masked_text.dart';
import 'package:flutter_animate/flutter_animate.dart';
import 'package:flutter_form_builder/flutter_form_builder.dart';
import 'package:form_builder_validators/form_builder_validators.dart';
import 'package:get/get.dart';
import 'package:getwidget/getwidget.dart';

Expand Down Expand Up @@ -66,7 +67,10 @@ class AsuransiView extends GetView<AsuransiController> {
),
FormBuilderTextField(
name: 'nama_perusahaan',
validator: FormBuilderValidators.required(),
autovalidateMode: AutovalidateMode.onUserInteraction,
decoration: const InputDecoration(
prefixIcon: Icon(Icons.business),
labelText: 'Nama Perusahaan Asuransi',
border: OutlineInputBorder(),
hintText: 'JAMKRINDO, ASKRINDO, dll',
Expand All @@ -77,9 +81,17 @@ class AsuransiView extends GetView<AsuransiController> {
),
FormBuilderTextField(
name: 'premi',
validator: FormBuilderValidators.compose([
FormBuilderValidators.required(),
FormBuilderValidators.numeric(),
FormBuilderValidators.max(100),
FormBuilderValidators.min(0),
]),
autovalidateMode: AutovalidateMode.onUserInteraction,
textAlign: TextAlign.right,
keyboardType: TextInputType.number,
decoration: const InputDecoration(
prefixIcon: Icon(Icons.money),
labelText: 'Premi',
suffixText: '%',
border: OutlineInputBorder(),
Expand Down Expand Up @@ -110,7 +122,22 @@ class AsuransiView extends GetView<AsuransiController> {
alignment: Alignment.bottomRight,
child: GFButton(
onPressed: () {
controller.hitungJumlahAsuransi();
if (controller
.formKey.currentState?.fields['premi']?.value !=
"") {
controller.hitungJumlahAsuransi();
} else {
Get.snackbar(
'Error',
'Premi tidak boleh kosong',
icon: const Icon(
Icons.error,
color: Colors.white,
),
backgroundColor: Colors.red,
colorText: Colors.white,
);
}
},
text: 'Hitung Asuransi',
elevation: 10,
Expand All @@ -125,6 +152,12 @@ class AsuransiView extends GetView<AsuransiController> {
FormBuilderTextField(
readOnly: true,
name: 'jumlahAsuransi',
keyboardType: TextInputType.number,
validator: FormBuilderValidators.compose([
FormBuilderValidators.required(),
FormBuilderValidators.numeric(),
]),
autovalidateMode: AutovalidateMode.onUserInteraction,
decoration: const InputDecoration(
labelText: 'Jumlah Asuransi',
border: OutlineInputBorder(),
Expand Down
17 changes: 16 additions & 1 deletion lib/app/modules/asuransi/views/edit_asuransi_view.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
import 'package:extended_masked_text/extended_masked_text.dart';
import 'package:flutter_animate/flutter_animate.dart';
import 'package:flutter_form_builder/flutter_form_builder.dart';
import 'package:form_builder_validators/form_builder_validators.dart';
import 'package:get/get.dart';
import 'package:getwidget/getwidget.dart';

Expand Down Expand Up @@ -66,7 +67,10 @@ class EditAsuransiView extends GetView<AsuransiController> {
),
FormBuilderTextField(
name: 'nama_perusahaan',
validator: FormBuilderValidators.required(),
autovalidateMode: AutovalidateMode.onUserInteraction,
decoration: const InputDecoration(
prefixIcon: Icon(Icons.business),
labelText: 'Nama Perusahaan Asuransi',
border: OutlineInputBorder(),
hintText: 'JAMKRINDO, ASKRINDO, dll',
Expand All @@ -81,7 +85,11 @@ class EditAsuransiView extends GetView<AsuransiController> {
FormBuilderTextField(
name: 'premi',
textAlign: TextAlign.right,
validator: FormBuilderValidators.required(),
keyboardType: TextInputType.number,
autovalidateMode: AutovalidateMode.onUserInteraction,
decoration: const InputDecoration(
prefixIcon: Icon(Icons.money),
labelText: 'Premi',
suffixText: '%',
border: OutlineInputBorder(),
Expand Down Expand Up @@ -112,7 +120,14 @@ class EditAsuransiView extends GetView<AsuransiController> {
alignment: Alignment.bottomRight,
child: GFButton(
onPressed: () {
controller.hitungJumlahAsuransi();
if (controller.formKey.currentState?.fields['premi']
?.value !=
'' ||
controller.formKey.currentState?.fields['premi']
?.value !=
'0') {
controller.hitungJumlahAsuransi();
}
},
text: 'Hitung Asuransi',
elevation: 10,
Expand Down
2 changes: 2 additions & 0 deletions lib/app/modules/asuransi/views/lihat_asuransi_view.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ class LihatAsuransiView extends GetView<AsuransiController> {
name: 'nama_perusahaan',
readOnly: true,
decoration: const InputDecoration(
prefixIcon: Icon(Icons.business),
labelText: 'Nama Perusahaan Asuransi',
border: OutlineInputBorder(),
hintText: 'JAMKRINDO, ASKRINDO, dll',
Expand All @@ -124,6 +125,7 @@ class LihatAsuransiView extends GetView<AsuransiController> {
controller: controller.premi =
TextEditingController(text: data.asuransi.premi),
decoration: const InputDecoration(
prefixIcon: Icon(Icons.money),
labelText: 'Premi',
suffixText: '%',
border: OutlineInputBorder(),
Expand Down
10 changes: 10 additions & 0 deletions lib/app/modules/ijin_legitimasi/views/edit_ijin_legitimasi_view.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import 'package:flutter/material.dart';
// 📦 Package imports:
import 'package:flutter_animate/flutter_animate.dart';
import 'package:flutter_form_builder/flutter_form_builder.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:form_builder_validators/form_builder_validators.dart';
import 'package:get/get.dart';
import 'package:getwidget/getwidget.dart';

Expand Down Expand Up @@ -74,10 +76,15 @@ class EditIjinLegitimasiView extends GetView<IjinLegitimasiController> {
),
FormBuilderTextField(
name: 'jenisIjinLegitimasi',
validator: FormBuilderValidators.required(),
autovalidateMode: AutovalidateMode.onUserInteraction,
controller: controller.jenisIjinLegitimasi =
TextEditingController(
text: data.ijinLegitimasi.jenisIjin),
decoration: const InputDecoration(
prefixIcon: Icon(
FontAwesomeIcons.solidFileLines,
),
labelText: 'Jenis Ijin',
border: OutlineInputBorder(),
hintText: 'Surat Keterangan Usaha',
Expand All @@ -88,10 +95,13 @@ class EditIjinLegitimasiView extends GetView<IjinLegitimasiController> {
),
FormBuilderTextField(
name: 'keteranganIjinLegitimasi',
validator: FormBuilderValidators.required(),
autovalidateMode: AutovalidateMode.onUserInteraction,
controller: controller.keteranganIjinLegitimasi =
TextEditingController(
text: data.ijinLegitimasi.keteranganIjin),
decoration: const InputDecoration(
prefixIcon: Icon(Icons.description),
labelText: 'Keterangan',
border: OutlineInputBorder(),
hintText: '107/UU/NGT/III/2022',
Expand Down
10 changes: 10 additions & 0 deletions lib/app/modules/ijin_legitimasi/views/ijin_legitimasi_view.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import 'package:flutter/material.dart';
// 📦 Package imports:
import 'package:flutter_animate/flutter_animate.dart';
import 'package:flutter_form_builder/flutter_form_builder.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:form_builder_validators/form_builder_validators.dart';
import 'package:get/get.dart';
import 'package:getwidget/getwidget.dart';

Expand Down Expand Up @@ -74,7 +76,12 @@ class IjinLegitimasiView extends GetView<IjinLegitimasiController> {
),
FormBuilderTextField(
name: 'jenisIjinLegitimasi',
validator: FormBuilderValidators.required(),
autovalidateMode: AutovalidateMode.onUserInteraction,
decoration: const InputDecoration(
prefixIcon: Icon(
FontAwesomeIcons.solidFileLines,
),
labelText: 'Jenis Ijin',
border: OutlineInputBorder(),
hintText: 'Surat Keterangan Usaha',
Expand All @@ -85,8 +92,11 @@ class IjinLegitimasiView extends GetView<IjinLegitimasiController> {
),
FormBuilderTextField(
name: 'keteranganIjinLegitimasi',
validator: FormBuilderValidators.required(),
autovalidateMode: AutovalidateMode.onUserInteraction,
controller: controller.keteranganIjinLegitimasi,
decoration: const InputDecoration(
prefixIcon: Icon(Icons.description),
labelText: 'Keterangan',
border: OutlineInputBorder(),
hintText: '107/UU/NGT/III/2022',
Expand Down
4 changes: 4 additions & 0 deletions lib/app/modules/ijin_legitimasi/views/lihat_ijin_legitimasi_view.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@ class LihatIjinLegitimasiView extends GetView<IjinLegitimasiController> {
text: data.ijinLegitimasi.jenisIjin,
),
decoration: const InputDecoration(
prefixIcon: Icon(
FontAwesomeIcons.solidFileLines,
),
labelText: 'Jenis Ijin',
border: OutlineInputBorder(),
hintText: 'Surat Keterangan Usaha',
Expand All @@ -134,6 +137,7 @@ class LihatIjinLegitimasiView extends GetView<IjinLegitimasiController> {
TextEditingController(
text: data.ijinLegitimasi.keteranganIjin),
decoration: const InputDecoration(
prefixIcon: Icon(Icons.description),
labelText: 'Keterangan',
border: OutlineInputBorder(),
hintText: '107/UU/NGT/III/2022',
Expand Down
49 changes: 47 additions & 2 deletions lib/app/modules/input_neraca/views/input_neraca_view.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ class InputNeracaView extends GetView<InputNeracaController> {
inputType: InputType.date,
format: DateFormat('dd/MM/yyyy'),
validator: FormBuilderValidators.required(),
autovalidateMode: AutovalidateMode.onUserInteraction,
name: 'Tanggal',
),
),
Expand Down Expand Up @@ -206,7 +207,26 @@ class InputNeracaView extends GetView<InputNeracaController> {
DataCell(
GFButton(
onPressed: () {
controller.hitungKasDanBank();
if (controller.formKey.currentState
?.fields['kas_on_hand']?.value !=
'' &&
controller.formKey.currentState
?.fields['tabungan']?.value !=
'') {
controller.hitungKasDanBank();
} else {
Get.snackbar(
'Error',
'Kolom Kas On Hand dan Tabungan tidak boleh kosong',
snackPosition: SnackPosition.TOP,
backgroundColor: Colors.red,
colorText: Colors.white,
icon: const Icon(
Icons.error,
color: Colors.white,
),
);
}
},
text: 'Hitung',
fullWidthButton: true,
Expand Down Expand Up @@ -545,7 +565,32 @@ class InputNeracaView extends GetView<InputNeracaController> {
// ),
GFButton(
onPressed: () {
controller.hitungAktivaTetap();
if (controller
.formKey
.currentState
?.fields['peralatan_mesin']
?.value !=
'' &&
controller.formKey.currentState
?.fields['kendaraan']?.value !=
'' &&
controller.formKey.currentState
?.fields['tanah_bangunan']?.value !=
'') {
controller.hitungAktivaTetap();
} else {
Get.snackbar(
'Error',
'Harap isi semua kolom',
snackPosition: SnackPosition.TOP,
backgroundColor: Colors.red,
colorText: Colors.white,
icon: const Icon(
Icons.error,
color: Colors.white,
),
);
}
},
text: 'Hitung',
type: GFButtonType.solid,
Expand Down
Loading

1 comment on commit b39a015

@vercel
Copy link

@vercel vercel bot commented on b39a015 Nov 27, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

infinite-impermanence – ./

infinite-impermanence-fleetime.vercel.app
infinite-impermanence.vercel.app
infinite-impermanence-git-master-fleetime.vercel.app
docs-akm.fleetime.my.id

Please sign in to comment.