remove saisie read simple person

Author: Elie Canonici Merle

src/assets/api_saisie_read.proto

@@ -190,34 +190,12 @@ message FicheParameters {
 }
 
 message WitnessEvent {
-  WitnessType witness_type = 1;
-  SimplePerson witness = 2;
-  string witness_note = 3;
-}
-message WitnessFicheEvent {
   WitnessType witness_type = 1;
   Person witness = 2;
   string witness_note = 3;
 }
 
 message Event {
-  string name = 1;
-  EventType type = 2;
-  optional string date = 3;
-  optional string date_long = 4;
-  optional string date_raw = 13;
-  optional string date_conv = 5;
-  optional string date_conv_long = 14;
-  optional Calendar date_cal = 6;
-  optional string place = 7;
-  optional string reason = 8;
-  optional string note = 9;
-  optional string src = 10;
-  optional SimplePerson spouse = 11;
-  repeated WitnessEvent witnesses = 12;
-}
-
-message FicheEvent {
   string name = 1;
   EventType type = 2;
   optional string date = 3;
@@ -231,7 +209,7 @@ message FicheEvent {
   optional string note = 9;
   optional string src = 10;
   optional Person spouse = 11;
-  repeated WitnessFicheEvent witnesses = 12;
+  repeated WitnessEvent witnesses = 12;
 }
 
 message PersonTree {
@@ -251,50 +229,12 @@ message PersonTree {
   bool name_is_restricted = 14;
 }
 
-message SimplePerson {
-  int32 index = 1;
-  Sex sex = 2;
-  string lastname = 3;
-  string firstname = 4;
-  string n = 5;
-  string p = 6;
-  int32 occ = 7;
-  optional string birth_short_date = 8;
-  optional string birth_date_raw = 15;
-  optional string birth_place = 9;
-  optional string death_short_date = 10;
-  optional string death_date_raw = 16;
-  optional string death_place = 11;
-  optional string image = 12;
-  Sosa sosa = 13;
-  string baseprefix = 14;
-  optional string sosa_nb = 17;
-  Visibility visible_for_visitors = 18;
-  bool has_parent = 19;
-  bool has_spouse = 20;
-  bool has_child = 21;
-  bool is_contemporary = 22;
-  bool name_is_hidden = 23;
-  bool name_is_restricted = 24;
-}
-
 message RelationPerson {
-  RelationType r_type = 1;
-  SimplePerson person = 2;
-}
-message RelationFichePerson {
   RelationType r_type = 1;
   Person person = 2;
 }
 
 message EventWitness {
-  string event_witness_type = 1;
-  SimplePerson husband = 2;
-  optional SimplePerson wife = 3;
-  string witness_note = 4;
-}
-
-message EventFicheWitness {
   string event_witness_type = 1;
   Person husband = 2;
   optional Person wife = 3;
@@ -352,8 +292,8 @@ message Person {
   repeated string titles = 40;
   repeated RelationPerson related = 41;
   repeated RelationPerson rparents = 42;
-  optional SimplePerson father = 43;
-  optional SimplePerson mother = 44;
+  optional Person father = 43;
+  optional Person mother = 44;
   repeated Family families = 45;
   Sosa sosa = 46;
   repeated Event events = 47;
@@ -383,35 +323,16 @@ message Person {
   optional string linked_page_head = 70;
   optional string linked_page_occu = 71;
   optional Visibility visible_for_visitors = 72;
-}
 
-message Family {
-  int32 index = 1;
-  SimplePerson spouse = 2;
-  optional string marriage_date = 3;
-  optional string marriage_date_long = 4;
-  optional string marriage_date_raw = 19;
-  optional string marriage_date_conv = 5;
-  optional string marriage_date_conv_long = 21;
-  optional string marriage_date_text = 23;
-  optional Calendar marriage_date_cal = 6;
-  optional string marriage_place = 7;
-  optional string marriage_src = 8;
-  MarriageType marriage_type = 9;
-  DivorceType divorce_type = 10;
-  optional string divorce_date = 11;
-  optional string divorce_date_long = 12;
-  optional string divorce_date_raw = 20;
-  optional string divorce_date_conv = 13;
-  optional string divorce_date_conv_long = 22;
-  optional Calendar divorce_date_cal = 14;
-  repeated WitnessEvent witnesses = 15;
-  optional string notes = 16;
-  optional string fsources = 17;
-  repeated SimplePerson children = 18;
+  optional bool has_parent = 73;
+  optional bool has_spouse = 74;
+  optional bool has_child = 75;
+  optional string birth_short_date = 76;
+  optional string death_short_date = 77;
+
 }
 
-message FicheFamily {
+message Family {
   int32 index = 1;
   Person spouse = 2;
   optional string marriage_date = 3;
@@ -431,7 +352,7 @@ message FicheFamily {
   optional string divorce_date_conv = 13;
   optional string divorce_date_conv_long = 22;
   optional Calendar divorce_date_cal = 14;
-  repeated WitnessFicheEvent witnesses = 15;
+  repeated WitnessEvent witnesses = 15;
   optional string notes = 16;
   optional string fsources = 17;
   repeated Person children = 18;