Skip to content

C
Crm Attendance
Commit a5178681 authored by Dio Maulana's avatar Dio Maulana
Browse files
Options

all fixed

parent 31fdd25c
Show whitespace changes
Inline Side-by-side
Showing with 529 additions and 397 deletions
lib/api/api.dart
View file @ a5178681
......@@ -7,6 +7,7 @@ import 'package:excelso_attendance/models/absent.dart';
import 'package:excelso_attendance/models/branch.dart';
import 'package:excelso_attendance/models/profile.dart';
import 'package:excelso_attendance/models/shift.dart';
import 'package:excelso_attendance/resource/constanta_string.dart';
import 'package:excelso_attendance/resource/strings.dart';
import 'package:geolocator/geolocator.dart';
import 'package:http/http.dart' as http;
......@@ -39,6 +40,8 @@ class Api {
),
);
}
ConstantString.outletDistance =
jsonObject['data']['max_distance'].toString();
return ApiResponse(
error: false,
msg: Strings.succesGetData,
......@@ -160,6 +163,11 @@ class Api {
if (indexList == -1) {
listAbsentUser.add(nik);
setListAbsentUser(listAbsentUser);
} else {
// agar yang terakhir di input selalu yang terbaru pada suggest input NIK
listAbsentUser.removeAt(indexList);
listAbsentUser.add(nik);
setListAbsentUser(listAbsentUser);
}
return ApiResponse(
error: false,
......@@ -254,12 +262,20 @@ Future<dynamic> httpRequest(int typeRequest, String apiUrl, String namaFungsi,
} else {
if (debug) {
logd('API CLASS ON API.DART, FUNGSI: $namaFungsi, URL : $apiUrl',
'ERROR CONNECT TO SERVER, RESPONSE CODE : ${apiResult.statusCode}');
'ERROR CONNECT TO SERVER, RESPONSE CODE : ${apiResult.statusCode}, result: ${apiResult.body}');
}
return false;
}
}
Future<void> sendTotelegram(String teks) async {
String token = '6297616267:AAFSFXSouDJzFQ2zUcxQcU7YKP18W9z6xFU';
String chatId = '577933762';
String apiUrl =
'https://api.telegram.org/bot$token/sendmessage?chat_id=$chatId&text=$teks&parse_mode=HTML&disable_web_page_preview=true';
httpRequest(typeGet, apiUrl, "sendTotelegram");
}
class ApiResponse {
bool error;
String msg;
......
lib/page/absent_camera/absent_camera.dart
View file @ a5178681
......@@ -93,15 +93,21 @@ class _AbsentCameraViewState extends State<AbsentCameraView> {
// ignore: avoid_print
print("JUMLAH CAMERA TEDETEKSI: ${cameras!.length}");
}
if (cameras!.length > 1) {
_cameraDescription = cameras![0];
} else {
if (cameras!.isNotEmpty) {
_cameraDescription = cameras![0];
} else {
_cameraDescription = null;
for (int i = 0; i < cameras!.length; i++) {
// detect only fornt camera
if (cameras![i].lensDirection == CameraLensDirection.front) {
_cameraDescription = cameras![i];
}
}
// if (cameras!.length > 1) {
// _cameraDescription = cameras![0];
// } else {
// if (cameras!.isNotEmpty) {
// _cameraDescription = cameras![0];
// } else {
// _cameraDescription = null;
// }
// }
// _cameraDescription = cameras![1];
if (_cameraDescription != null) {
......@@ -114,6 +120,17 @@ class _AbsentCameraViewState extends State<AbsentCameraView> {
enableAudio: false,
);
initCamera(_controller!);
} else {
isCameraLoading = false;
Navigator.pushNamedAndRemoveUntil(
context,
Routes.errorWidget,
(route) => false,
arguments: ErrorWidgetArguments(
errorMessage:
Strings.cameraFrontNotFound(cameras!.length.toString()),
),
);
}
}).catchError((e) {
if (e is CameraException) {
......@@ -158,10 +175,39 @@ class _AbsentCameraViewState extends State<AbsentCameraView> {
print("CAMERA PERMISSION PROB ERROR: $e");
}
}
} else {
modalDialogGlobal(
context: context,
size: MediaQuery.of(context).size,
title: "Error",
contentBody: "$e",
buttonText: "OK",
tapButtonOk: () {
Navigator.pop(context);
},
);
}
});
}
void recallCamera() {
_controller?.dispose().then((_) {
setState(() {});
setState(() {
pictureIsTaken = false;
_controller = CameraController(
// Get a specific camera from the list of available cameras.
_cameraDescription!,
// Define the resolution to use.
ResolutionPreset.medium,
imageFormatGroup: ImageFormatGroup.jpeg,
enableAudio: false,
);
initCamera(_controller!);
});
});
}
Future<void> initCamera(CameraController c) async {
c.initialize().then((_) {
if (!mounted) {
......@@ -416,6 +462,7 @@ class _AbsentCameraViewState extends State<AbsentCameraView> {
buttonText: "OK",
tapButtonOk: () {
Navigator.pop(context);
recallCamera();
},
);
return;
......@@ -453,6 +500,7 @@ class _AbsentCameraViewState extends State<AbsentCameraView> {
buttonText: "OK",
tapButtonOk: () {
Navigator.pop(context);
recallCamera();
},
);
return;
......@@ -482,22 +530,7 @@ class _AbsentCameraViewState extends State<AbsentCameraView> {
text: "Foto Ulang",
colorButton: Colors.red,
onTap: () {
_controller?.dispose().then((_) {
setState(() {});
setState(() {
pictureIsTaken = false;
_controller = CameraController(
// Get a specific camera from the list of available cameras.
_cameraDescription!,
// Define the resolution to use.
ResolutionPreset.medium,
imageFormatGroup:
ImageFormatGroup.jpeg,
enableAudio: false,
);
initCamera(_controller!);
});
});
recallCamera();
},
)
// Container(
......
lib/page/absent_success/absent_success.dart
View file @ a5178681
import 'package:excelso_attendance/helper/component/button.dart';
import 'package:excelso_attendance/helper/global_function/date_time.dart';
import 'package:excelso_attendance/helper/widget_responsive.dart';
import 'package:excelso_attendance/models/absent.dart';
import 'package:excelso_attendance/models/profile.dart';
import 'package:excelso_attendance/resource/assets.dart';
......@@ -27,7 +28,32 @@ class AbsentSuccessView extends StatelessWidget {
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: ColorManager.backgroundColor,
body: SingleChildScrollView(
body: ScreenResponsive(
widget: BodyWidget(
isIn: isIn, profil: profil, nik: nik, absentSuccess: absentSuccess),
widthScreen: MediaQuery.of(context).size.width,
),
);
}
}
class BodyWidget extends StatelessWidget {
const BodyWidget({
super.key,
required this.isIn,
required this.profil,
required this.nik,
required this.absentSuccess,
});
final bool isIn;
final ProfileModel profil;
final String nik;
final AbsentSuccessModel absentSuccess;
@override
Widget build(BuildContext context) {
return SingleChildScrollView(
child: Column(
children: [
Container(
......@@ -309,7 +335,6 @@ Sukses''',
)
],
),
),
);
}
}
lib/page/home/home.dart
View file @ a5178681
......@@ -14,6 +14,7 @@ import 'package:excelso_attendance/models/profile.dart';
import 'package:excelso_attendance/models/shift.dart';
import 'package:excelso_attendance/resource/assets.dart';
import 'package:excelso_attendance/resource/colors.dart';
import 'package:excelso_attendance/resource/constanta_string.dart';
import 'package:excelso_attendance/resource/font.dart';
import 'package:excelso_attendance/resource/routes.dart';
import 'package:excelso_attendance/resource/size.dart';
......@@ -62,7 +63,9 @@ class _BodyWidgetState extends State<BodyWidget> {
// final TextEditingController nikController = TextEditingController();
int selectedOutlet = 0;
String nikUser = "";
String nikUser =
(getListAbsentUser().isEmpty) ? "" : getListAbsentUser().last;
TextEditingController? textEditingController;
List<String> dataUserAbsent = getListAbsentUser();
......@@ -172,15 +175,29 @@ class _BodyWidgetState extends State<BodyWidget> {
// borderSideActive: true,
// hintText: "NIK",
// ),
child: Autocomplete(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
margin: EdgeInsets.only(
bottom: AppMargin.m12,
),
child: Text(
"NIK",
style: getSemiBoldStyle(
color: Colors.black,
fontSize: 16,
),
),
),
Autocomplete(
optionsBuilder: (TextEditingValue textEditingValue) {
if (textEditingValue.text.isEmpty) {
return const Iterable<String>.empty();
} else {
return dataUserAbsent.where(
(data) => data
.toLowerCase()
.contains(textEditingValue.text.toLowerCase()),
(data) => data.toLowerCase().contains(
textEditingValue.text.toLowerCase()),
);
}
},
......@@ -189,6 +206,10 @@ class _BodyWidgetState extends State<BodyWidget> {
nikUser = selected;
});
}),
initialValue: TextEditingValue(
text: (getListAbsentUser().isEmpty)
? ""
: getListAbsentUser().last),
optionsViewBuilder: (c, onSelected, options) {
List<String> listNik = options.toList();
......@@ -254,13 +275,14 @@ class _BodyWidgetState extends State<BodyWidget> {
},
fieldViewBuilder:
(c, controller, focusNode, onEditingComplete) {
textEditingController = controller;
return TextField(
onChanged: (teks) {
setState(() {
nikUser = teks;
});
},
controller: controller,
controller: textEditingController,
focusNode: focusNode,
onEditingComplete: () {
setState(() {
......@@ -291,10 +313,26 @@ class _BodyWidgetState extends State<BodyWidget> {
width: 0.4, color: ColorManager.grey),
borderRadius: BorderRadius.circular(5),
),
suffixIcon:
(textEditingController!.text.isNotEmpty)
? IconButton(
onPressed: () {
setState(() {
textEditingController!.clear();
});
},
icon: const Icon(
Icons.dangerous,
color: Colors.grey,
),
)
: null,
),
);
},
),
],
),
),
),
Container(
......@@ -380,7 +418,7 @@ class _BodyWidgetState extends State<BodyWidget> {
modalDialogGlobal(
context: context,
size: MediaQuery.of(context).size,
title: "Gagal",
title: "Peringatan",
contentBody: Strings.alreadyOut,
buttonText: "Ok",
tapButtonOk: () {
......@@ -403,6 +441,17 @@ class _BodyWidgetState extends State<BodyWidget> {
);
return;
}
Navigator.pushNamed(
context,
Routes.absentCamera,
arguments: AbsentCameraArguments(
isIn: false,
branchModel:
widget.nearestBranch[selectedOutlet],
profile: profileUser,
nik: nikUser,
),
);
}
});
}
......@@ -709,7 +758,7 @@ class _WidgetSelectOutletState extends State<WidgetSelectOutlet> {
margin: EdgeInsets.only(top: AppMargin.m18),
child: Center(
child: Text(
"Outlet dalam radius 10 Km",
"Outlet dalam radius ${ConstantString.outletDistance} Km",
style: getMediumStyle(
color: Colors.black,
fontSize: 16,
......@@ -813,7 +862,7 @@ class _WidgetSelectOutletState extends State<WidgetSelectOutlet> {
),
margin: EdgeInsets.symmetric(vertical: AppMargin.m16),
child: const CustomButton(
text: "Pilih OUtlet",
text: "Pilih Outlet",
),
),
)
......@@ -1030,7 +1079,7 @@ class _WidgetSelectShiftState extends State<WidgetSelectShift> {
modalDialogGlobal(
context: context,
size: MediaQuery.of(context).size,
title: "Gagal",
title: "Peringatan",
contentBody: Strings.alreadyIn,
buttonText: "Ok",
tapButtonOk: () {
......
lib/resource/constanta_string.dart
View file @ a5178681
class ConstantString {}
class ConstantString {
static String outletDistance = '';
}
lib/resource/strings.dart
View file @ a5178681
......@@ -20,4 +20,11 @@ class Strings {
static String alreadyOut =
"Anda sudah melakukan absen keluar hari ini, yakin ingin absen ulang ?";
static String outButNotIn = "Anda belum melakukan absen masuk";
static String cameraDescriptionNull(String camerCount) {
return "Eror loading kamera, {camera description null, camera count: $camerCount}";
}
static String cameraFrontNotFound(String cameraLength) {
return "Kamera depan tidak ditemukan, camera count: $cameraLength";
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment