Skip to content

GitLab

"...git@183.82.99.133:saisrinivas/gen_services.git" did not exist on "166fed3d544e1d395fdcd9fce383f145c7e2cf4e"
Commit b35acfea authored by Sai Srinivas's avatar Sai Srinivas
Browse files

local fix

parents ebb11608 2a087139
Show whitespace changes
Inline Side-by-side
lib/screens/serviceEngineer/serviceEngineerDashboard.dart
View file @ b35acfea
......@@ -244,7 +244,7 @@ class _ServiceengineerdashboardState extends State<Serviceengineerdashboard> {
child: Container(
padding: EdgeInsets.only(
left: 10,
top: 10,
top: 9,
bottom: 10,
right: 10,
),
......@@ -272,7 +272,7 @@ class _ServiceengineerdashboardState extends State<Serviceengineerdashboard> {
child: Text(
"${numbers[index].toString()}",
style: TextStyle(
fontSize: 20,
fontSize: 18,
color: Color(textColorCodes[index]),
),
),
......
lib/services/api_calling.dart
View file @ b35acfea
......@@ -24,6 +24,7 @@ import 'package:generp/Models/crmModels/crmNewLeadsProspectsViewResponse.dart';
import 'package:generp/Models/crmModels/crmProspectDetailsAddFollowUpAppointmentResponse.dart';
import 'package:generp/Models/crmModels/crmProspectDetailsAddLeadsResponse.dart';
import 'package:generp/Models/crmModels/crmProspectDetailsResponse.dart';
import 'package:generp/Models/financeModels/ValidateGstNumResponse.dart';
import 'package:generp/Models/financeModels/addDirectPaymentResponse.dart';
import 'package:generp/Models/financeModels/paymentRequisitionPaymentsListResponse.dart';
import 'package:generp/Models/hrmModels/advanceListResponse.dart';
......@@ -63,6 +64,7 @@ import '../Models/PaymentCollectionResponse.dart';
import '../Models/PaymentCollectionValidateOTPResponse.dart';
import '../Models/PaymentCollectionWalletResponse.dart';
import '../Models/ProfileResponse.dart';
import '../Models/ServiceComplaintBillListResponse.dart';
import '../Models/SessionResponse.dart';
import '../Models/StatusResponse.dart';
import '../Models/SubmitComplaintResponse.dart';
......@@ -77,6 +79,7 @@ import '../Models/UpdateComplaintResponse.dart';
import '../Models/UpdatePasswordResponse.dart';
import '../Models/VersionsResponse.dart';
import '../Models/ViewVisitDetailsResponse.dart';
import '../Models/commonModels/EditCommonAccFormDetailsResponse.dart';
import '../Models/commonModels/commonAddAccountsSubmitResponse.dart';
import '../Models/crmModels/appointmentCalendarResponse.dart';
import '../Models/crmModels/crmAddFollowUpResponse.dart';
......@@ -85,6 +88,7 @@ import '../Models/crmModels/crmDashboardResponse.dart';
import '../Models/crmModels/crmPendingTasksResponse.dart';
import '../Models/crmModels/crmSelectedProductDetailsResponse.dart';
import '../Models/crmModels/crmUniversalSearchResponse.dart';
import '../Models/financeModels/ValidateBankAccountDetailsResponse.dart';
import '../Models/financeModels/paymentRequestionBankDetailsResponse.dart';
import '../Models/commonModels/commonAccountLedgerFilterResponse.dart';
import '../Models/commonModels/commonAccountLedgerResponse.dart';
......@@ -926,7 +930,7 @@ class ApiCalling {
};
final res = await post(data, technicianNearbyGeneratorsUrl, {});
if (res != null) {
// print(data);
print(" input data: $data");
// debugPrint(res.body);
return NearbyGeneratorsResponse.fromJson(jsonDecode(res.body));
} else {
......@@ -939,6 +943,36 @@ class ApiCalling {
}
}
static Future<NearbyGeneratorsResponse?> loadCrmNearbyGeneratorsAPI(
empId,
session,
techLoc,
radius,
status,
) async {
try {
Map<String, String> data = {
'emp_id': (empId).toString(),
'session_id': (session).toString(),
'emp_loc': (techLoc).toString(),
'radius': (radius).toString(),
};
final res = await post(data, crmNearbyGeneratorsUrl, {});
if (res != null) {
print(" input data: $data");
debugPrint("Map api response ${res.body}");
return NearbyGeneratorsResponse.fromJson(jsonDecode(res.body));
} else {
debugPrint("Null Response");
return null;
}
} catch (e) {
debugPrint('hello bev=bug $e ');
return null;
}
}
static Future<AccountSuggestionResonse?> AccountSuggestionAPI(
empId,
session,
......@@ -963,6 +997,34 @@ class ApiCalling {
return null;
}
}
/// service Complaint Bill List Api
static Future<ServiceComplaintBillListResponse?> serviceComplaintBillListAPI(
empId,
session,
complaintId,
) async {
try {
Map<String, String> data = {
'emp_id': (empId).toString(),
'session_id': (session).toString(),
'complaint_id': (complaintId).toString(),
};
debugPrint("@@@@@@@@@@@@@@@@@@@@@@ input data: $data");
final res = await post(data, serviceComplaintBillListUrl, {});
if (res != null) {
debugPrint(res.body);
return ServiceComplaintBillListResponse.fromJson(jsonDecode(res.body));
} else {
debugPrint("Null Response");
return null;
}
} catch (e) {
debugPrint('###########Exception $e ');
return null;
}
}
static Future<TechnicianPendingComplaintsResponse?>
LoadTechnicianComplaintsAPI(empId, session) async {
......@@ -1216,15 +1278,17 @@ class ApiCalling {
session,
compId,
) async {
try {
Map<String, String> data = {
'emp_id': (empId).toString(),
'session_id': (session).toString(),
'comp_id': (compId).toString(),
};
debugPrint("&&&&&&&&&&&&&&&&&&&&&&& input: $data");
final res = await post(data, technicianComplaintFollowUpUrl, {});
if (res != null) {
debugPrint(res.body);
debugPrint("followup response ${res.body}");
return FollowupListResponse.fromJson(jsonDecode(res.body));
} else {
debugPrint("Null Response");
......@@ -1694,6 +1758,122 @@ class ApiCalling {
}
}
/// validate Gst Number Api
static Future<ValidateGstNumResponse?> validateGstNumberApi(
empId,
session,
gstNumber,
) async {
try {
Map<String, String> data = {
'emp_id': (empId).toString(),
'session_id': (session).toString(),
'gst_number': (gstNumber).toString(),
};
final res = await post(data, validateGstNumberUrl, {});
if (res != null) {
debugPrint(res.body);
return ValidateGstNumResponse.fromJson(jsonDecode(res.body));
} else {
debugPrint("Null Response");
return null;
}
} catch (e) {
debugPrint('hello validateGstNumberApi $e ');
return null;
}
}
/// validate bank account details api
static Future<ValidateBankAccountDetailsResponse?> validateBankAccountDetailsApi(
empId,
session,
accountNum,
ifscCode
) async {
try {
Map<String, String> data = {
'emp_id': (empId).toString(),
'session_id': (session).toString(),
'account_number': (accountNum).toString(),
'ifsc_code': (ifscCode).toString(),
};
final res = await post(data, validateBankAccountDetailsUrl, {});
if (res != null) {
debugPrint(res.body);
return ValidateBankAccountDetailsResponse.fromJson(jsonDecode(res.body));
} else {
debugPrint("Null Response");
return null;
}
} catch (e) {
debugPrint('hello validateBankAccountDetails $e ');
return null;
}
}
static Future<CommonResponse?> commonUpdateAccountDetailsAPI(
empId,
sessionId,
accId,
name,
mob1,
mob2,
tel,
email,
designation,
address,
state,
district,
subLocality,
bankName,
branchName,
bankIfscCode,
accHolderName,
bankAccNumber,
bankUpiId,
) async {
try {
Map<String, String> data = {
'emp_id': empId.toString(),
'session_id': sessionId.toString(),
'acc_id': accId.toString(),
'name': name.toString(),
'mob1': mob1.toString(),
'mob2': mob2.toString(),
'tel': tel.toString(),
'email': email.toString(),
'designation': designation.toString(),
'address': address.toString(),
'state': state.toString(),
'district': district.toString(),
'sub_locality': subLocality.toString(),
'bank_name': bankName.toString(),
'bank_branch_name': branchName.toString(),
'bank_ifsc_code': bankIfscCode.toString(),
'bank_account_holder_name': accHolderName.toString(),
'bank_account_number': bankAccNumber.toString(),
'bank_upi_id': bankUpiId.toString(),
};
var res = await post(data, commonUpdateAccountDetailsUrl, {});
if (res != null) {
print("Input Date: $data");
debugPrint(res.body);
return CommonResponse.fromJson(jsonDecode(res.body),
);
} else {
debugPrint("Null Response");
return null;
}
} catch (e) {
debugPrint('hello bev=bug $e ');
return null;
}
}
static Future<paymentRequestionBankDetailsResponse?>
paymentRequestionBankDetailsAPI(empId, session, accountId) async {
try {
......@@ -2244,6 +2424,31 @@ class ApiCalling {
}
}
static Future<EditCommonAccFormDetailsResponse?> commonAccountDetailsListAPI(
empId,
session,
accountId,
) async {
try {
Map<String, String> data = {
'emp_id': (empId).toString(),
'session_id': (session).toString(),
'acc_id': accountId.toString(),
};
final res = await post(data, commonAccountDetailsUrl, {});
if (res != null) {
debugPrint(res.body);
return EditCommonAccFormDetailsResponse.fromJson(jsonDecode(res.body));
} else {
debugPrint("Null Response");
return null;
}
} catch (e) {
debugPrint('hello bev=bug $e ');
return null;
}
}
static Future<commonAccountLedgerFilterResponse?>
commonAccountLedgerDropDownAPI(empId, session) async {
try {
......@@ -3787,7 +3992,7 @@ class ApiCalling {
alphabet,
pageNumber,
) async {
debugPrint('crmLeadListFilterSubmitAPI Input data:');
debugPrint('#########crmLeadListFilterSubmitAPI Input data:');
debugPrint('empId: $empId');
debugPrint('session: $session');
debugPrint('mode: $mode');
......@@ -5645,7 +5850,7 @@ class ApiCalling {
empId,
pageNumber
) async {
debugPrint("🔥🔥🔥🔥🔥🔥🔥Response");
debugPrint("Response");
try {
Map<String, String> data = {
'session_id': (session).toString(),
......@@ -5654,7 +5859,7 @@ class ApiCalling {
final res = await post(data, EmployeeContactListUrl, {});
if (res != null) {
print("Request Data: $data");
debugPrint("🔥🔥🔥🔥🔥🔥🔥 Response: ${res.body}");
debugPrint(" Response: ${res.body}");
return ContactListResponse.fromJson(jsonDecode(res.body));
} else {
debugPrint("Null Response");
......@@ -5666,6 +5871,68 @@ class ApiCalling {
}
}
static Future<CommonResponse?> fetchRazorpayUpiQrApi(
session,
empId,
amount,
refType,
refId
) async {
try {
Map<String, String> data = {
'session_id': (session).toString(),
'emp_id': (empId).toString(),
'amount': (amount),
'ref_type': (refType).toString(),
'ref_id': (refId),
};
debugPrint("Input to QR : $data");
final res = await post(data, createRazorpayUpiQrUrl, {});
if (res != null) {
print(data);
debugPrint(res.body);
return CommonResponse.fromJson(jsonDecode(res.body));
} else {
debugPrint("Null Response");
return null;
}
} catch (e) {
debugPrint('hello bev=bug $e ');
return null;
}
}
static Future<CommonResponse?> fetchRazorpayUpiQrStatusApi(
session,
empId,
razorpayOrderId,
) async {
try {
Map<String, String> data = {
'session_id': (session).toString(),
'emp_id': (empId).toString(),
'razorpay_order_id': (razorpayOrderId),
};
final res = await post(data, fetchRazorpayUpiQrStatusUrl, {});
if (res != null) {
print(data);
debugPrint(res.body);
return CommonResponse.fromJson(jsonDecode(res.body));
} else {
debugPrint("Null Response");
return null;
}
} catch (e) {
debugPrint('hello bev=bug $e ');
return null;
}
}
// static Future<CommonResponse?> TpcIssueListApprovalAPI(
// empId,
// session,
......@@ -5704,4 +5971,29 @@ class ApiCalling {
// return null;
// }
// }
static Future<CommonResponse?> trackLiveLocationEmpolyeeAPI(empId, session,location) async {
try {
Map<String, String> data = {
'emp_id': (empId).toString(),
'session_id': (session).toString(),
'location': (location),
};
// print(data);
final res = await post(data, liveLocationStatusUrl, {});
if (res != null) {
print("BACKGROUND LOCATION DATA : ${data}");
debugPrint("BACKGROUND LOCATION: ${res.body}");
// print("check_session: ${res.body}");
return CommonResponse.fromJson(jsonDecode(res.body));
} else {
debugPrint("Null Response");
return null;
}
} catch (e) {
debugPrint('hello bev=bug $e ');
return null;
}
}
}
lib/services/api_names.dart
View file @ b35acfea
const baseUrl = "https://erp.gengroup.in/ci/app/";
const baseUrl_test = "https://erp.gengroup.in/ci/app/Api_home/";
const trackingUrl = "https://erp.gengroup.in/ci/app/Home/";
// var WEB_SOCKET_URL = "wss://ws.erp.gengroup.in/?type=user&route=employe_live_location_update&session_id=${Sessionid}";
const getAppVersionUrl = "https://erp.gengroup.in/ci/assets/appversion.json";
......@@ -31,6 +32,7 @@ const genTrackerRegisterComplaint = "${baseUrl}home/gen_tracker_register_complai
///complaint
const complaintsSelectionUrl = "${baseUrl}home/compliants_select_data";
const serviceComplaintBillListUrl = "${baseUrl_test}service_complaint_bill_list";
///inventory
const inventoryPartDetailsUrl = "${baseUrl}home/inventory_part_details";
......@@ -51,7 +53,7 @@ const technicianPaymentCollectionOtpUrl= "${baseUrl}home/technician_payment_coll
const technicianPaymentCollectionUrl= "${baseUrl}home/technician_payment_collection_list";
const technicianWalletCollectionUrl= "${baseUrl}home/technician_payment_collection_wallet";
const technicianComplaintDetailsUrl= "${baseUrl}home/technician_complaint_details";
const technicianComplaintFollowUpUrl= "${baseUrl}home/technician_complaint_followup_list";
const technicianComplaintFollowUpUrl= "${baseUrl}Home/technician_complaint_followup_list";
const technicianAddContactUrl= "${baseUrl}home/technician_add_contact";
const technicianUpdateVisitUrl= "${baseUrl}home/technician_update_visit";
......@@ -74,6 +76,9 @@ const paymentRequesitionPaymentsDetailsUrl = "${baseUrl_test}payment_requisition
const paymentRequesitionPaymentsReceiptsListUrl = "${baseUrl_test}payment_receipts_list_v2";
const paymentRequesitionPaymentsReceiptsDetailsUrl = "${baseUrl_test}payment_receipt_details";
const paymentRequesitionEditProcessedPaymentUrl = "${baseUrl_test}edit_processes_payment";
const validateGstNumberUrl = "${baseUrl_test}validate_gst_number";
const validateBankAccountDetailsUrl = "${baseUrl_test}validate_bank_account_details";
const commonUpdateAccountDetailsUrl = "${baseUrl_test}common_update_account_details";
///common Module
......@@ -87,6 +92,7 @@ const commonAccountListUrl = "${baseUrl_test}common_account_list_v2";
const commonAccountLedgerDropDownUrl = "${baseUrl_test}common_account_ledger_list_view";
const commonAccountLedgerListWithFilterUrl = "${baseUrl_test}common_account_ledger_list_submit_filter_v2";
const commonAccountLedgerAccountDetails = "${baseUrl_test}common_account_details";
const commonAccountDetailsUrl = "${baseUrl_test}common_account_list_v2";
///order Module
const ordersAccessiblePagesUrl = "${baseUrl_test}crm_order_accessible_pages";
......@@ -182,6 +188,7 @@ const crmDashboardQuotationsUrl = "${baseUrl_test}crm_dashboard_quotations_list"
const ogcharturl = "${baseUrl_test}organisation_structures";
const JobDesciptionUrl ="${baseUrl_test}job_description";
const crmNearbyGeneratorsUrl= "${baseUrl_test}crm_nearby_generators";
///HRM
//Attendance
......@@ -208,5 +215,7 @@ const CasuaLeaveHistoryUrl ="${baseUrl_test}casual_leave_history";
const EmployeeContactListUrl ="${baseUrl_test}employee_contact_list";
const AdvanceListUrl ="${baseUrl_test}advance_list";
const createRazorpayUpiQrUrl ="${baseUrl_test}create_razorpay_upi_qr";
const fetchRazorpayUpiQrStatusUrl ="${baseUrl_test}fetch_razorpay_upi_qr_status";
const liveLocationStatusUrl ="${trackingUrl}sattendance_live_location_update";
\ No newline at end of file
pubspec.lock
View file @ b35acfea
......@@ -598,6 +598,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.12.0"
flutter_foreground_task:
dependency: "direct main"
description:
name: flutter_foreground_task
sha256: "9f1b25a81db95d7119d2c5cffc654048cbdd49d4056183e1beadc1a6a38f3e29"
url: "https://pub.dev"
source: hosted
version: "9.1.0"
flutter_html:
dependency: "direct main"
description:
......@@ -1312,6 +1320,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.0"
open_filex:
dependency: "direct main"
description:
name: open_filex
sha256: "9976da61b6a72302cf3b1efbce259200cd40232643a467aac7370addf94d6900"
url: "https://pub.dev"
source: hosted
version: "4.7.0"
package_config:
dependency: transitive
description:
......
pubspec.yaml
View file @ b35acfea
......@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix.
version: 1.0.107+116
version: 1.0.107+117
environment:
sdk: ^3.7.2
......@@ -94,6 +94,8 @@ dependencies:
flutter_html: ^3.0.0
photo_view: ^0.14.0
flutter_contacts: ^1.1.9+2
open_filex: ^4.7.0
flutter_foreground_task: ^9.1.0
dev_dependencies:
......
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