Skip to content

T
TUORCA-MOBILE
Commit 2800b9c6 by Mobile : Art
Options

fixAcademic

parent 37da7aa9
Showing with 223 additions and 88 deletions
.flutter-plugins 0 → 100644
# This is a generated file; do not edit or check into version control.
flutter_image_compress=/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_image_compress-0.6.8/
flutter_plugin_android_lifecycle=/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_plugin_android_lifecycle-1.0.11/
get_version=/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/get_version-0.2.2/
image_cropper=/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/image_cropper-1.3.1/
image_picker=/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/image_picker-0.6.7+22/
package_info=/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/package_info-0.4.3+4/
path_provider=/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.28/
path_provider_linux=/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_linux-0.0.1+2/
path_provider_macos=/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_macos-0.0.4+8/
path_provider_windows=/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_windows-0.0.4+3/
shared_preferences=/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.12+4/
shared_preferences_linux=/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_linux-0.0.2+4/
shared_preferences_macos=/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_macos-0.0.1+11/
shared_preferences_web=/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_web-0.1.2+7/
shared_preferences_windows=/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_windows-0.0.2+3/
sqflite=/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.1+2/
.flutter-plugins-dependencies 0 → 100644
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_image_compress","path":"/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_image_compress-0.6.8/","dependencies":[]},{"name":"get_version","path":"/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/get_version-0.2.2/","dependencies":["package_info"]},{"name":"image_cropper","path":"/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/image_cropper-1.3.1/","dependencies":[]},{"name":"image_picker","path":"/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/image_picker-0.6.7+22/","dependencies":[]},{"name":"package_info","path":"/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/package_info-0.4.3+4/","dependencies":[]},{"name":"path_provider","path":"/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.28/","dependencies":[]},{"name":"shared_preferences","path":"/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.12+4/","dependencies":[]},{"name":"sqflite","path":"/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.1+2/","dependencies":[]}],"android":[{"name":"flutter_image_compress","path":"/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_image_compress-0.6.8/","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","path":"/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_plugin_android_lifecycle-1.0.11/","dependencies":[]},{"name":"get_version","path":"/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/get_version-0.2.2/","dependencies":["package_info"]},{"name":"image_cropper","path":"/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/image_cropper-1.3.1/","dependencies":[]},{"name":"image_picker","path":"/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/image_picker-0.6.7+22/","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"package_info","path":"/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/package_info-0.4.3+4/","dependencies":[]},{"name":"path_provider","path":"/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.28/","dependencies":[]},{"name":"shared_preferences","path":"/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.12+4/","dependencies":[]},{"name":"sqflite","path":"/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.1+2/","dependencies":[]}],"macos":[{"name":"package_info","path":"/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/package_info-0.4.3+4/","dependencies":[]},{"name":"path_provider_macos","path":"/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_macos-0.0.4+8/","dependencies":[]},{"name":"shared_preferences_macos","path":"/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_macos-0.0.1+11/","dependencies":[]},{"name":"sqflite","path":"/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.1+2/","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_linux-0.0.1+2/","dependencies":[]},{"name":"shared_preferences_linux","path":"/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_linux-0.0.2+4/","dependencies":["path_provider_linux"]}],"windows":[{"name":"path_provider_windows","path":"/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_windows-0.0.4+3/","dependencies":[]},{"name":"shared_preferences_windows","path":"/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_windows-0.0.2+3/","dependencies":["path_provider_windows"]}],"web":[{"name":"shared_preferences_web","path":"/Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_web-0.1.2+7/","dependencies":[]}]},"dependencyGraph":[{"name":"flutter_image_compress","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"get_version","dependencies":["package_info"]},{"name":"image_cropper","dependencies":[]},{"name":"image_picker","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"package_info","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":[]},{"name":"shared_preferences","dependencies":["shared_preferences_linux","shared_preferences_macos","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]},{"name":"sqflite","dependencies":[]}],"date_created":"2024-02-20 11:01:34.234670","version":"1.17.0"}
\ No newline at end of file
.idea/.gitignore 0 → 100644
# Default ignored files
/shelf/
/workspace.xml
.idea/TUORCA-MOBILE.iml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
<excludeFolder url="file://$MODULE_DIR$/build" />
<excludeFolder url="file://$MODULE_DIR$/.pub" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Dart SDK" level="project" />
<orderEntry type="library" name="Flutter Plugins" level="project" />
<orderEntry type="library" name="Dart Packages" level="project" />
</component>
</module>
\ No newline at end of file
.idea/libraries/Dart_SDK.xml 0 → 100644
<component name="libraryTable">
<library name="Dart SDK">
<CLASSES>
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/async" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/cli" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/collection" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/convert" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/core" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/developer" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/ffi" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/html" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/indexed_db" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/io" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/isolate" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/js" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/js_util" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/math" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/mirrors" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/svg" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/typed_data" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/wasm" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/web_audio" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/web_gl" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/web_sql" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
.idea/libraries/Flutter_Plugins.xml 0 → 100644
<component name="libraryTable">
<library name="Flutter Plugins" type="FlutterPluginsLibraryType">
<CLASSES>
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_linux-0.0.1+2" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.12+4" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.28" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_linux-0.0.2+4" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_image_compress-0.6.8" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_plugin_android_lifecycle-1.0.11" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/package_info-0.4.3+4" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_windows-0.0.4+3" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/get_version-0.2.2" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_web-0.1.2+7" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/image_picker-0.6.7+22" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.1+2" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_windows-0.0.2+3" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_macos-0.0.4+8" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/image_cropper-1.3.1" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
.idea/modules.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/TUORCA-MOBILE.iml" filepath="$PROJECT_DIR$/.idea/TUORCA-MOBILE.iml" />
</modules>
</component>
</project>
\ No newline at end of file
.idea/vcs.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>
\ No newline at end of file
.packages 0 → 100644
This diff is collapsed. Click to expand it.
lib/page/academic_schedule/academic_create/academic_create_page.dart
......@@ -19,7 +19,8 @@ class AcademicCreatePage extends StatefulWidget {
final DateTime initialDate;
final AcademicDetailDataModel dataEdit;
AcademicCreatePage({Key key, this.initialDate, this.dataEdit}) : super(key: key);
AcademicCreatePage({Key key, this.initialDate, this.dataEdit})
: super(key: key);
@override
_AcademicCreatePageState createState() => _AcademicCreatePageState();
......@@ -49,7 +50,8 @@ class _AcademicCreatePageState extends State<AcademicCreatePage> {
FocusScope.of(context).unfocus();
},
child: BaseContainer(
title: ResourceString.getString(widget.dataEdit == null ? 'create_schedule' : 'edit_schedule'),
title: ResourceString.getString(
widget.dataEdit == null ? 'create_schedule' : 'edit_schedule'),
child: ClipRRect(
borderRadius: BorderRadius.vertical(top: Radius.circular(50)),
child: Container(
......@@ -136,10 +138,14 @@ class _AcademicCreatePageState extends State<AcademicCreatePage> {
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(5),
border: Border.all(
color: _presenter.hasStartTime && _presenter.hasEndTime
? Color(0xff2E363C)
: Theme.of(context).errorColor,
width: _presenter.hasStartTime && _presenter.hasEndTime ? 0.5 : 1,
color:
_presenter.hasStartTime && _presenter.hasEndTime
? Color(0xff2E363C)
: Theme.of(context).errorColor,
width:
_presenter.hasStartTime && _presenter.hasEndTime
? 0.5
: 1,
),
),
child: Row(
......@@ -177,28 +183,34 @@ class _AcademicCreatePageState extends State<AcademicCreatePage> {
],
),
),
!_presenter.hasStartTime || !_presenter.hasEndTime ? Text('', style: TextStyle(fontSize: SizeService.getFontSize(42))) : Container(),
!_presenter.hasStartTime || !_presenter.hasEndTime
? Text('',
style: TextStyle(
fontSize: SizeService.getFontSize(42)))
: Container(),
],
),
),
],
),
_dropdown(
ResourceString.getString('type'),
initialValue: _presenter.typeId,
onChanged: _presenter.onTypeChanged,
validator: Validation.emptyField,
items: _presenter.masterData != null
? _presenter.masterData.academic_type_data.map((item) {
return DropdownMenuItem(
value: item.code,
child: Text(
item.name,
),
);
}).toList()
: null,
),
_presenter.masterData == null
? Container()
: _dropdown(
ResourceString.getString('type'),
initialValue: _presenter.typeId,
onChanged: _presenter.onTypeChanged,
validator: Validation.emptyField,
items: _presenter.masterData != null
? _presenter.masterData.academic_type_data.map((item) {
return DropdownMenuItem(
value: item.code,
child: Text(
item.name,
),
);
}).toList()
: null,
),
_textField(
controller: _presenter.titleCtrl,
hint: ResourceString.getString('title'),
......@@ -212,22 +224,24 @@ class _AcademicCreatePageState extends State<AcademicCreatePage> {
controller: _presenter.participants2Ctrl,
hint: ResourceString.getString('praticipants') + ' 2',
),
_dropdown(
ResourceString.getString('advidor'),
initialValue: _presenter.advidorId,
onChanged: _presenter.onAdvidorChanged,
validator: Validation.emptyField,
items: _presenter.masterData != null
? _presenter.masterData.advisor_data.map((item) {
return DropdownMenuItem(
value: item.code,
child: Text(
item.name,
),
);
}).toList()
: null,
),
_presenter.masterData == null
? Container()
: _dropdown(
ResourceString.getString('advidor'),
initialValue: _presenter.advidorId,
onChanged: _presenter.onAdvidorChanged,
validator: Validation.emptyField,
items: _presenter.masterData != null
? _presenter.masterData.staff_data.map((item) {
return DropdownMenuItem(
value: item.code,
child: Text(
item.name,
),
);
}).toList()
: null,
),
_textField(
controller: _presenter.remarkCtrl,
hint: ResourceString.getString('remark'),
......@@ -242,7 +256,9 @@ class _AcademicCreatePageState extends State<AcademicCreatePage> {
child: CustomButton(
onPressed: _presenter.onSubmit,
radius: 10,
buttonText: ResourceString.getString(widget.dataEdit == null ? 'create_schedule' : 'edit_schedule'),
buttonText: ResourceString.getString(widget.dataEdit == null
? 'create_schedule'
: 'edit_schedule'),
),
),
],
......
lib/page/surgery_schedule/surgery_create/surgery_create_page.dart
......@@ -363,26 +363,29 @@ class _SurgeryCreatePageState extends State<SurgeryCreatePage> {
// ),
],
),
_dropdown(
ResourceString.getString('staff_name'),
initValue: _presenter.staffId,
onChanged: (v) {
setState(() {
_presenter.staffId = v;
});
},
validator: _presenter.isEditState ? null : Validation.emptyField,
items: _presenter.masterData != null
? _presenter.masterData.staff_data.map((item) {
return DropdownMenuItem(
value: item.code,
child: Text(
item.name,
),
);
}).toList()
: null,
),
_presenter.masterData == null
? Container()
: _dropdown(
ResourceString.getString('staff_name'),
initValue: _presenter.staffId,
onChanged: (v) {
setState(() {
_presenter.staffId = v;
});
},
validator:
_presenter.isEditState ? null : Validation.emptyField,
items: _presenter.masterData != null
? _presenter.masterData.staff_data.map((item) {
return DropdownMenuItem(
value: item.code,
child: Text(
item.name,
),
);
}).toList()
: null,
),
_textField(
controller: _presenter.patientNameCtrl,
hint: ResourceString.getString('patient_name'),
......@@ -461,33 +464,35 @@ class _SurgeryCreatePageState extends State<SurgeryCreatePage> {
_spaceBox,
Expanded(
child: Container(
child: _dropdown(
ResourceString.getString('group'),
initValue: _presenter.group,
fillColor: _presenter.groupColor,
onChanged: (v) {
print("v => ${v}");
var colorHex = _presenter.masterData.group_data
.where((w) => w.code == v)
.first
.color;
print(v);
setState(() {
_presenter.groupColor = HexColor(colorHex);
_presenter.group = v;
});
},
items: _presenter.masterData != null
? _presenter.masterData.group_data.map((item) {
return DropdownMenuItem(
value: item.code,
child: Text(
item.name,
),
);
}).toList()
: null,
),
child: _presenter.masterData == null
? Container()
: _dropdown(
ResourceString.getString('group'),
initValue: _presenter.group,
fillColor: _presenter.groupColor,
onChanged: (v) {
print("v => ${v}");
var colorHex = _presenter.masterData.group_data
.where((w) => w.code == v)
.first
.color;
print(v);
setState(() {
_presenter.groupColor = HexColor(colorHex);
_presenter.group = v;
});
},
items: _presenter.masterData != null
? _presenter.masterData.group_data.map((item) {
return DropdownMenuItem(
value: item.code,
child: Text(
item.name,
),
);
}).toList()
: null,
),
),
),
],
......
lib/service/api.dart
......@@ -384,6 +384,11 @@ class Api<T> {
await _httpConnection(this._baseApi + "academic/list",
headers: this._headers, body: body)
.then((response) {
print("academic/list");
print(this._baseApi + "academic/list");
print(this._headers);
print(body);
print(response.body);
if (response.statusCode == 200) {
_model = AcademicListModel.fromJson(_jsonDecode(response.body));
} else {
......
pubspec.yaml
name: tuoc
description: TU Orthopedic Calendar Application
version: 1.0.0+12
version: 1.0.0+13
environment:
# sdk: ">=2.1.0 <3.0.0"
......
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