Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
2
2018-app-inutralia
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
inutralia
2018-app-inutralia
Commits
b1d4237b
Commit
b1d4237b
authored
Jan 30, 2019
by
Javier Piris
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Modificados modelos con las nuevas properties y los nuevos estados + imágenes de estados
parent
165680ce
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
31 additions
and
27 deletions
+31
-27
cerrada.png
inutralia/inutralia.Droid/Resources/drawable/cerrada.png
+0
-0
respondida_por_cliente.png
...ralia.Droid/Resources/drawable/respondida_por_cliente.png
+0
-0
inutralia.Droid.csproj
inutralia/inutralia.Droid/inutralia.Droid.csproj
+1
-1
QuestionMessage.cs
inutralia/inutralia.Models/Questions/QuestionMessage.cs
+14
-14
QuestionSpecialist.cs
inutralia/inutralia.Models/Questions/QuestionSpecialist.cs
+9
-9
cerrada.png
inutralia/inutralia.iOS/Resources/cerrada.png
+0
-0
NewQuestionViewModel.cs
...ia/ViewModels/QuestionsSpecialist/NewQuestionViewModel.cs
+4
-2
PendingReadViewModel.cs
...ia/ViewModels/QuestionsSpecialist/PendingReadViewModel.cs
+3
-1
No files found.
inutralia/inutralia.Droid/Resources/drawable/cerrada.png
0 → 100644
View file @
b1d4237b
1.36 KB
inutralia/inutralia.Droid/Resources/drawable/respondid
o
.png
→
inutralia/inutralia.Droid/Resources/drawable/respondid
a_por_cliente
.png
View file @
b1d4237b
File moved
inutralia/inutralia.Droid/inutralia.Droid.csproj
View file @
b1d4237b
...
...
@@ -375,7 +375,7 @@
<AndroidResource Include="Resources\drawable\pendiente.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\respondid
o
.png" />
<AndroidResource Include="Resources\drawable\respondid
a_por_cliente
.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\Add1.png" />
...
...
inutralia/inutralia.Models/Questions/QuestionMessage.cs
View file @
b1d4237b
...
...
@@ -7,12 +7,12 @@ namespace inutralia.Models
[
JsonObject
(
MemberSerialization
.
OptIn
)]
public
class
QuestionMessage
:
ObservableEntityData
{
public
bool
FromExpert
=>
!
FromUser
;
//
public bool FromExpert => !FromUser;
public
QuestionMessage
()
{
Text
=
""
;
FromUser
=
true
;
//
FromUser = true;
}
[
JsonProperty
(
"message"
,
Required
=
Required
.
Always
)]
...
...
@@ -23,22 +23,22 @@ namespace inutralia.Models
set
{
SetProperty
(
ref
_Text
,
value
,
"Text"
);
}
}
[
JsonProperty
(
"from_user"
,
Required
=
Required
.
Always
)]
public
bool
FromUser
{
get
;
set
;
}
//
[JsonProperty("from_user", Required = Required.Always)]
//
public bool FromUser { get; set; }
[
JsonProperty
(
"title"
,
Required
=
Required
.
Always
)]
public
string
Title
{
get
;
set
;
}
//
[JsonProperty("title", Required = Required.Always)]
//
public string Title { get; set; }
[
JsonProperty
(
"name"
,
Required
=
Required
.
Always
)]
public
string
Nombre
{
get
;
set
;
}
//
[JsonProperty("name", Required = Required.Always)]
//
public string Nombre { get; set; }
[
JsonProperty
(
"description"
,
Required
=
Required
.
Always
)]
public
string
Descripcion
{
get
;
set
;
}
//
[JsonProperty("description", Required = Required.Always)]
//
public string Descripcion { get; set; }
[
JsonProperty
(
"created_at"
,
Required
=
Required
.
Always
)]
public
int
CreatedAt
{
get
;
set
;
}
//
[JsonProperty("created_at", Required = Required.Always)]
//
public int CreatedAt { get; set; }
[
JsonProperty
(
"image"
,
Required
=
Required
.
Always
)]
public
string
Image
{
get
;
set
;
}
//
[JsonProperty("image", Required = Required.Always)]
//
public string Image { get; set; }
}
}
inutralia/inutralia.Models/Questions/QuestionSpecialist.cs
View file @
b1d4237b
...
...
@@ -18,11 +18,11 @@ namespace inutralia.Models
Messages
=
msgs
;
}
public
enum
Estatus
{
Pending
,
Answered
}
public
enum
Estatus
{
Pending
,
Answered
_for_client
,
Answered_for_nutricionist
,
Closed
}
public
string
StatusImg
=>
imgStatus
[
StateId
];
[
JsonProperty
(
"
estado
_id"
,
Required
=
Required
.
Always
)]
[
JsonProperty
(
"
state
_id"
,
Required
=
Required
.
Always
)]
public
int
StateId
{
get
;
set
;
}
[
JsonProperty
(
"status"
,
Required
=
Required
.
Always
)]
...
...
@@ -30,18 +30,17 @@ namespace inutralia.Models
public
Estatus
State
{
get
;
set
;
}
[
JsonProperty
(
"subject"
,
Required
=
Required
.
Always
)]
public
string
Subject
{
get
;
set
;
}
public
string
Subject
{
get
;
set
;
}
[
JsonProperty
(
"updated_at"
,
Required
=
Required
.
Always
)]
public
int
UpdatedAt
{
get
;
set
;
}
[
JsonProperty
(
"messages"
,
Required
=
Required
.
Always
)]
[
JsonProperty
(
"message"
,
Required
=
Required
.
Always
)]
public
IEnumerable
<
QuestionMessage
>
Messages
{
get
;
set
;
}
string
[]
imgStatus
=
new
string
[
2
]
{
"message_status_pendiente.png"
,
// 1 - Pendiente de responder
"message_status_respondido.png"
,
// 2 - Respondida
"pendiente.png"
,
// 1 - Pendiente de responder
//"respondida_por_cliente.png", // 2 - Respondida por cliente
//"respondida_por_nutricionista", // 3- Respondida por nutricionista
"cerrada"
// 4 - Conversación cerrada
};
}
}
\ No newline at end of file
inutralia/inutralia.iOS/Resources/cerrada.png
0 → 100644
View file @
b1d4237b
1.36 KB
inutralia/inutralia/ViewModels/QuestionsSpecialist/NewQuestionViewModel.cs
View file @
b1d4237b
...
...
@@ -13,7 +13,9 @@ namespace inutralia.ViewModels.QuestionsSpecialist
public
enum
Estatus
{
Pending
,
Answered
Answered_for_client
,
Answered_for_nutricionist
,
Closed
}
public
QuestionSpecialist
QuestionSpecialist
{
private
set
;
get
;
}
...
...
@@ -247,7 +249,7 @@ namespace inutralia.ViewModels.QuestionsSpecialist
IsBusy
=
false
;
}
public
bool
IsCloseOrPending
=>
(
State
==
Estatus
.
Answered
||
State
==
Estatus
.
Pending
)
&&
QuestionSpecialist
.
Messages
.
Count
()
>
0
||
State
==
Estatus
.
Answered
;
public
bool
IsCloseOrPending
=>
(
State
==
Estatus
.
Answered
_for_client
||
State
==
Estatus
.
Answered_for_nutricionist
||
State
==
Estatus
.
Pending
||
State
==
Estatus
.
Closed
)
&&
QuestionSpecialist
.
Messages
.
Count
()
>
0
||
State
==
Estatus
.
Answered_for_nutricionist
;
public
bool
MayBeClosed
=>
!
IsCloseOrPending
;
}
...
...
inutralia/inutralia/ViewModels/QuestionsSpecialist/PendingReadViewModel.cs
View file @
b1d4237b
...
...
@@ -8,7 +8,9 @@ namespace inutralia.ViewModels
public
enum
Estatus
{
Pendiente
=
1
,
Respondida
=
2
Respondida_por_cliente
=
2
,
Respondida_por_nutricionista
=
3
,
Cerrado
=
4
}
public
PendingReadViewModel
(
QuestionSpecialist
questionSpecialist
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment