Haroon6138
/
mohemm-flutter-app
1
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity

Merge branch 'Fatima' into 'master'

Browse Source 
Fatima

See merge request mirza.shafique/mohem_flutter_app!78
merge-requests/1/merge
Sikander Saleem 3 years ago
parent 5ce57fc547 2a5f232c4d
commit 53bf7d68ed
11 changed files with 68 additions and 17 deletions
Show Stats Download Patch File Download Diff File

10
assets/langs/ar-SA.json
Unescape Escape View File

@ -30,7 +30,7 @@
"services": "خدمات",
"viewAllServices": "عرض جميع الخدمات",
"monthlyAttendance": "الحضور الشهري",
"vacationRule": "حكم اجازة",
"vacationRule": "قاعدة الاجازات",
"vacationType": "نوع الاجازة",
"startDateT": "تاريخ البدء",
"endDateT": "تاريخ الانتهاء",
@ -393,6 +393,14 @@
"uploadFromGallery": "تحميل من\nملفات الجهاز",
"name": "الأسم",
"email": "ايميل",
"noHistoryAvailable":"لايوجد سجل بيانات سابقة ",
"purchaseRequisition": "طلب شراء",
"moveOrder": "طلب تغيير",
"humanResource": "الموارد البشريه",
"purchaseOrder": "امر شراء",
"ITGForms": "ITG نماذج",
"itemCreation": "أنشاء عنصر",
"stamp": "ختم",
"profile": {
"reset_password": {
"label": "Reset Password",

8
assets/langs/en-US.json
Unescape Escape View File

@ -393,6 +393,14 @@
"uploadFromGallery": "Upload from\nGallery",
"name": "Name",
"email": "Email",
"noHistoryAvailable": "No History Available",
"purchaseRequisition": "Purchase Requisition",
"moveOrder": "Move Order",
"humanResource": "Human Resource",
"purchaseOrder": "Purchase Order",
"ITGForms": "ITG Forms",
"itemCreation": "Item Creation",
"stamp": "Stamp",
"profile": {
"reset_password": {
"label": "Reset Password",

16
lib/generated/codegen_loader.g.dart
Unescape Escape View File

@ -409,6 +409,14 @@ class CodegenLoader extends AssetLoader{
"uploadFromGallery": "تحميل من\nملفات الجهاز",
"name": "الأسم",
"email": "ايميل",
"noHistoryAvailable": "لايوجد سجل بيانات سابقة ",
"purchaseRequisition": "طلب شراء",
"moveOrder": "طلب تغيير",
"humanResource": "الموارد البشريه",
"purchaseOrder": "امر شراء",
"ITGForms": "ITG نماذج",
"itemCreation": "أنشاء عنصر",
"stamp": "ختم",
"profile": {
"reset_password": {
"label": "Reset Password",
@ -838,6 +846,14 @@ static const Map<String,dynamic> en_US = {
"uploadFromGallery": "Upload from\nGallery",
"name": "Name",
"email": "Email",
"noHistoryAvailable": "No History Available",
"purchaseRequisition": "Purchase Requisition",
"moveOrder": "Move Order",
"humanResource": "Human Resource",
"purchaseOrder": "Purchase Order",
"ITGForms": "ITG Forms",
"itemCreation": "Item Creation",
"stamp": "Stamp",
"profile": {
"reset_password": {
"label": "Reset Password",

8
lib/generated/locale_keys.g.dart
Unescape Escape View File

@ -394,6 +394,14 @@ abstract class LocaleKeys {
static const uploadFromGallery = 'uploadFromGallery';
static const name = 'name';
static const email = 'email';
static const noHistoryAvailable = 'noHistoryAvailable';
static const purchaseRequisition = 'purchaseRequisition';
static const moveOrder = 'moveOrder';
static const humanResource = 'humanResource';
static const purchaseOrder = 'purchaseOrder';
static const ITGForms = 'ITGForms';
static const itemCreation = 'itemCreation';
static const stamp = 'stamp';
static const profile_reset_password_label = 'profile.reset_password.label';
static const profile_reset_password_username = 'profile.reset_password.username';
static const profile_reset_password_password = 'profile.reset_password.password';

5
lib/ui/my_team/employee_details.dart
Unescape Escape View File

@ -4,6 +4,7 @@ import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:mohem_flutter_app/api/my_team/my_team_api_client.dart';
import 'package:mohem_flutter_app/app_state/app_state.dart';
import 'package:mohem_flutter_app/classes/colors.dart';
import 'package:mohem_flutter_app/classes/utils.dart';
import 'package:mohem_flutter_app/config/routes.dart';
@ -251,7 +252,9 @@ class _EmployeeDetailsState extends State<EmployeeDetails> {
height: 150,
child: Column(
children: [
Text("Do you want to add" + "${getEmployeeSubordinates!.eMPLOYEENAME.toString()}" + "in your favorite list "),
AppState().isArabic(context)
? Text("هل تريد اضافة" + " ${getEmployeeSubordinates!.eMPLOYEENAME} " + "لقائمة المفضله")
: Text("Do you want to add" + " ${getEmployeeSubordinates!.eMPLOYEENAME} " + "in your favorite list "),
CircularAvatar(
url: getEmployeeSubordinates!.eMPLOYEEIMAGE ?? "",
height: 50,

4
lib/ui/work_list/sheets/delegate_sheet.dart
Unescape Escape View File

@ -1,5 +1,6 @@
import 'dart:collection';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:mohem_flutter_app/api/worklist/worklist_api_client.dart';
@ -8,6 +9,7 @@ import 'package:mohem_flutter_app/classes/utils.dart';
import 'package:mohem_flutter_app/extensions/int_extensions.dart';
import 'package:mohem_flutter_app/extensions/string_extensions.dart';
import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
import 'package:mohem_flutter_app/models/generic_response_model.dart';
import 'package:mohem_flutter_app/models/get_action_history_list_model.dart';
import 'package:mohem_flutter_app/models/worklist/get_favorite_replacements_model.dart';
@ -115,7 +117,7 @@ class _DelegateSheetState extends State<DelegateSheet> {
children: [
widget.title.toText24(isBold: true),
21.height,
"Search".toText16(),
LocaleKeys.search.tr().toText16(),
11.height,
Column(
crossAxisAlignment: CrossAxisAlignment.end,

6
lib/ui/work_list/sheets/request_more_info_sheet.dart
Unescape Escape View File

@ -1,7 +1,9 @@
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:mohem_flutter_app/classes/colors.dart';
import 'package:mohem_flutter_app/extensions/string_extensions.dart';
import 'package:mohem_flutter_app/extensions/int_extensions.dart';
import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
import 'package:mohem_flutter_app/ui/work_list/sheets/selected_item_sheet.dart';
import 'package:mohem_flutter_app/widgets/bottom_sheet.dart';
import 'package:mohem_flutter_app/widgets/button/default_button.dart';
@ -39,7 +41,7 @@ class RequestMoreInfoSheet extends StatelessWidget {
children: [
"Request more info".toText24(),
24.height,
"Search".toText16(),
LocaleKeys.search.tr().toText16(),
12.height,
Row(
children: [
@ -123,7 +125,7 @@ class RequestMoreInfoSheet extends StatelessWidget {
color: MyColors.borderColor,
),
DefaultButton(
"Cancel",
LocaleKeys.cancel.tr(),
() {
Navigator.pop(context);
},

4
lib/ui/work_list/sheets/search_options_sheet.dart
Unescape Escape View File

@ -1,8 +1,10 @@
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:mohem_flutter_app/classes/colors.dart';
import 'package:mohem_flutter_app/extensions/int_extensions.dart';
import 'package:mohem_flutter_app/extensions/string_extensions.dart';
import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
import 'package:mohem_flutter_app/widgets/radio/show_radio.dart';
class SearchOptionsSheet extends StatelessWidget {
@ -28,7 +30,7 @@ class SearchOptionsSheet extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
"Search By".toText16(),
LocaleKeys.searchBy.tr().toText16(),
12.height,
ListView.separated(
itemBuilder: (context, index) {

6
lib/ui/work_list/sheets/selected_item_sheet.dart
Unescape Escape View File

@ -1,9 +1,11 @@
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:mohem_flutter_app/api/worklist/worklist_api_client.dart';
import 'package:mohem_flutter_app/classes/colors.dart';
import 'package:mohem_flutter_app/classes/utils.dart';
import 'package:mohem_flutter_app/extensions/int_extensions.dart';
import 'package:mohem_flutter_app/extensions/string_extensions.dart';
import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
import 'package:mohem_flutter_app/models/get_action_history_list_model.dart';
import 'package:mohem_flutter_app/models/worklist/get_favorite_replacements_model.dart';
import 'package:mohem_flutter_app/models/worklist/replacement_list_model.dart';
@ -67,7 +69,7 @@ class SelectedItemSheet extends StatelessWidget {
children: [
Expanded(
child: DefaultButton(
"Cancel",
LocaleKeys.cancel.tr(),
() {
Navigator.pop(context);
},
@ -81,7 +83,7 @@ class SelectedItemSheet extends StatelessWidget {
16.width,
Expanded(
child: DefaultButton(
"Submit",
LocaleKeys.submit.tr(),
() {
String? email = "", userId = "";
if (actionHistoryList != null) {

16
lib/ui/work_list/work_list_screen.dart
Unescape Escape View File

@ -32,19 +32,19 @@ class WorkListScreen extends StatefulWidget {
class _WorkListScreenState extends State<WorkListScreen> {
List<WorkListItemTypeModelData> workListItemTypes = [
WorkListItemTypeModelData(
value: 0, name: 'HR', fullName: 'Human Resource', active: false, color: [Color(0xff32D892), Color(0xff1AB170)], icon: "assets/images/miss_swipe.svg", key: 'HRSSA', disable: false),
value: 0, name: 'HR', fullName: LocaleKeys.humanResource.tr(), active: false, color: [Color(0xff32D892), Color(0xff1AB170)], icon: "assets/images/miss_swipe.svg", key: 'HRSSA', disable: false),
WorkListItemTypeModelData(
value: 0, name: 'MO', fullName: 'Move Order', active: false, color: [Color(0xff58DCFA), Color(0xff3CB9D5)], icon: "assets/images/miss_swipe.svg", key: 'INVMOA', disable: false),
value: 0, name: 'MO', fullName: LocaleKeys.moveOrder.tr(), active: false, color: [Color(0xff58DCFA), Color(0xff3CB9D5)], icon: "assets/images/miss_swipe.svg", key: 'INVMOA', disable: false),
WorkListItemTypeModelData(
value: 0, name: 'PR', fullName: 'Purchase Requisition', active: false, color: [Color(0xff48EACF), Color(0xff3DCAB3)], icon: "assets/images/miss_swipe.svg", key: 'REQAPPRV', disable: false),
value: 0, name: 'PR', fullName: LocaleKeys.purchaseRequisition.tr(), active: false, color: [Color(0xff48EACF), Color(0xff3DCAB3)], icon: "assets/images/miss_swipe.svg", key: 'REQAPPRV', disable: false),
WorkListItemTypeModelData(
value: 0, name: 'PO', fullName: 'Purchase Order', active: false, color: [Color(0xff5099E3), Color(0xff3670AA)], icon: "assets/images/miss_swipe.svg", key: 'POAPPRV', disable: false),
value: 0, name: 'PO', fullName: LocaleKeys.purchaseOrder.tr(), active: false, color: [Color(0xff5099E3), Color(0xff3670AA)], icon: "assets/images/miss_swipe.svg", key: 'POAPPRV', disable: false),
WorkListItemTypeModelData(
value: 0, name: 'ITG', fullName: 'ITG Forms', active: false, color: [Color(0xffEB8C90), Color(0xffDE6C70)], icon: "assets/images/miss_swipe.svg", key: 'ITG', disable: false),
value: 0, name: 'ITG', fullName: LocaleKeys.ITGForms.tr(), active: false, color: [Color(0xffEB8C90), Color(0xffDE6C70)], icon: "assets/images/miss_swipe.svg", key: 'ITG', disable: false),
WorkListItemTypeModelData(
value: 0, name: 'IC', fullName: 'Item Creation', active: false, color: [Color(0xff32D892), Color(0xff1AB170)], icon: "assets/images/miss_swipe.svg", key: 'INVITEM', disable: false),
value: 0, name: 'IC', fullName: LocaleKeys.itemCreation.tr(), active: false, color: [Color(0xff32D892), Color(0xff1AB170)], icon: "assets/images/miss_swipe.svg", key: 'INVITEM', disable: false),
WorkListItemTypeModelData(
value: 0, name: 'STAMP', fullName: 'Stamp', active: false, color: [Color(0xff32D892), Color(0xff1AB170)], icon: "assets/images/miss_swipe.svg", key: 'STAMP', disable: false),
value: 0, name: 'STAMP', fullName: LocaleKeys.stamp.tr(), active: false, color: [Color(0xff32D892), Color(0xff1AB170)], icon: "assets/images/miss_swipe.svg", key: 'STAMP', disable: false),
];
int workListItemIndex = 0;
@ -207,7 +207,7 @@ class _WorkListScreenState extends State<WorkListScreen> {
: Expanded(
child: workList != null
? ((workList!).isEmpty
? "No History Available".toText16().center
? LocaleKeys.noHistoryAvailable.tr().toText16().center
: ListView.separated(
physics: const BouncingScrollPhysics(),
itemBuilder: (context, index) {

2
lib/ui/work_list/worklist_settings.dart
Unescape Escape View File

@ -69,7 +69,7 @@ class _WorklistSettingsState extends State<WorklistSettings> {
context,
title: LocaleKeys.worklistSettings.tr(),
),
body:Column(
body:ListView(
children: [
Expanded(
child: Container(

Write Preview
Loading…
Cancel
Save