Commit b1d4237b by Javier Piris

Modificados modelos con las nuevas properties y los nuevos estados + imágenes de estados

parent 165680ce
...@@ -375,7 +375,7 @@ ...@@ -375,7 +375,7 @@
<AndroidResource Include="Resources\drawable\pendiente.png" /> <AndroidResource Include="Resources\drawable\pendiente.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<AndroidResource Include="Resources\drawable\respondido.png" /> <AndroidResource Include="Resources\drawable\respondida_por_cliente.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<AndroidResource Include="Resources\drawable\Add1.png" /> <AndroidResource Include="Resources\drawable\Add1.png" />
......
...@@ -7,12 +7,12 @@ namespace inutralia.Models ...@@ -7,12 +7,12 @@ namespace inutralia.Models
[JsonObject(MemberSerialization.OptIn)] [JsonObject(MemberSerialization.OptIn)]
public class QuestionMessage : ObservableEntityData public class QuestionMessage : ObservableEntityData
{ {
public bool FromExpert => !FromUser; //public bool FromExpert => !FromUser;
public QuestionMessage() public QuestionMessage()
{ {
Text = ""; Text = "";
FromUser = true; //FromUser = true;
} }
[JsonProperty("message", Required = Required.Always)] [JsonProperty("message", Required = Required.Always)]
...@@ -23,22 +23,22 @@ namespace inutralia.Models ...@@ -23,22 +23,22 @@ namespace inutralia.Models
set { SetProperty(ref _Text, value, "Text"); } set { SetProperty(ref _Text, value, "Text"); }
} }
[JsonProperty("from_user", Required = Required.Always)] //[JsonProperty("from_user", Required = Required.Always)]
public bool FromUser { get; set; } //public bool FromUser { get; set; }
[JsonProperty("title", Required = Required.Always)] //[JsonProperty("title", Required = Required.Always)]
public string Title { get; set; } //public string Title { get; set; }
[JsonProperty("name", Required = Required.Always)] //[JsonProperty("name", Required = Required.Always)]
public string Nombre { get; set; } //public string Nombre { get; set; }
[JsonProperty("description", Required = Required.Always)] //[JsonProperty("description", Required = Required.Always)]
public string Descripcion { get; set; } //public string Descripcion { get; set; }
[JsonProperty("created_at", Required = Required.Always)] //[JsonProperty("created_at", Required = Required.Always)]
public int CreatedAt { get; set; } //public int CreatedAt { get; set; }
[JsonProperty("image", Required = Required.Always)] //[JsonProperty("image", Required = Required.Always)]
public string Image { get; set; } //public string Image { get; set; }
} }
} }
...@@ -18,11 +18,11 @@ namespace inutralia.Models ...@@ -18,11 +18,11 @@ namespace inutralia.Models
Messages = msgs; Messages = msgs;
} }
public enum Estatus { Pending, Answered } public enum Estatus { Pending, Answered_for_client, Answered_for_nutricionist, Closed }
public string StatusImg => imgStatus[StateId]; public string StatusImg => imgStatus[StateId];
[JsonProperty("estado_id", Required = Required.Always)] [JsonProperty("state_id", Required = Required.Always)]
public int StateId { get; set; } public int StateId { get; set; }
[JsonProperty("status", Required = Required.Always)] [JsonProperty("status", Required = Required.Always)]
...@@ -32,16 +32,15 @@ namespace inutralia.Models ...@@ -32,16 +32,15 @@ namespace inutralia.Models
[JsonProperty("subject", Required = Required.Always)] [JsonProperty("subject", Required = Required.Always)]
public string Subject { get; set; } public string Subject { get; set; }
[JsonProperty("updated_at", Required = Required.Always)] [JsonProperty("message", Required = Required.Always)]
public int UpdatedAt { get; set; }
[JsonProperty("messages", Required = Required.Always)]
public IEnumerable<QuestionMessage> Messages { get; set; } public IEnumerable<QuestionMessage> Messages { get; set; }
string[] imgStatus = new string[2] string[] imgStatus = new string[2]
{ {
"message_status_pendiente.png", // 1 - Pendiente de responder "pendiente.png", // 1 - Pendiente de responder
"message_status_respondido.png", // 2 - Respondida //"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
...@@ -13,7 +13,9 @@ namespace inutralia.ViewModels.QuestionsSpecialist ...@@ -13,7 +13,9 @@ namespace inutralia.ViewModels.QuestionsSpecialist
public enum Estatus public enum Estatus
{ {
Pending, Pending,
Answered Answered_for_client,
Answered_for_nutricionist,
Closed
} }
public QuestionSpecialist QuestionSpecialist { private set; get; } public QuestionSpecialist QuestionSpecialist { private set; get; }
...@@ -247,7 +249,7 @@ namespace inutralia.ViewModels.QuestionsSpecialist ...@@ -247,7 +249,7 @@ namespace inutralia.ViewModels.QuestionsSpecialist
IsBusy = false; 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; public bool MayBeClosed => !IsCloseOrPending;
} }
......
...@@ -8,7 +8,9 @@ namespace inutralia.ViewModels ...@@ -8,7 +8,9 @@ namespace inutralia.ViewModels
public enum Estatus public enum Estatus
{ {
Pendiente = 1, Pendiente = 1,
Respondida = 2 Respondida_por_cliente = 2,
Respondida_por_nutricionista = 3,
Cerrado = 4
} }
public PendingReadViewModel(QuestionSpecialist questionSpecialist) public PendingReadViewModel(QuestionSpecialist questionSpecialist)
......
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