Fix relation labels

jhoobergs · Sep 28, 2021 · 8422ef6 · 8422ef6
1 parent bafcb31
commit 8422ef6
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 5 deletions.
diff --git a/erd/src/erd.rs b/erd/src/erd.rs
@@ -154,6 +154,11 @@ impl ToDot for Relation {
     fn to_dot_statements(&self) -> Vec<dot::Statement> {
         let relation_name: String = self.name.clone().into();
 
+        let relation_label = if let Some(l) = self.label.clone() {
+            l
+        } else {
+            relation_name.clone()
+        };
         let relation_node = dot::Statement::Node(dot::NodeStatement {
             node: relation_name.clone(),
             attributes: Some(dot::AttributeList {
@@ -164,7 +169,7 @@ impl ToDot for Relation {
                     },
                     dot::AListItem {
                         key: "label".into(),
-                        value: format!("{}", relation_name.clone(),),
+                        value: format!("\"{}\"", relation_label),
                     },
                 ]),
                 tail: Box::new(None),
@@ -219,13 +224,13 @@ impl ToDot for Relation {
                             key: "color".into(),
                             value: match member.optionality {
                                 RelationOptionality::Optional => "black",
-                                RelationOptionality::Required => "\"black:invis:black\"",
+                                RelationOptionality::Required => "\"black:invis:invis:black\"",
                             }
                             .into(),
                         },
                         dot::AListItem {
                             key: "label".into(),
-                            value: amount,
+                            value: format!("<<font color=\"blue\">{}</font>>", amount),
                         },
                         dot::AListItem {
                             key: "len".into(),
@@ -310,7 +315,7 @@ impl ToDot for ERD {
                 content: dot::AList(vec![
                     dot::AListItem {
                         key: "pad".into(),
-                        value: "0.5".to_string(),
+                        value: "2".to_string(),
                     },
                     dot::AListItem {
                         key: "nodesep".into(),

diff --git a/erd/src/main.rs b/erd/src/main.rs
@@ -12,6 +12,7 @@ use parser::ConsumeError;
 fn parse_file(path: &std::path::Path) -> Result<Vec<ast::Expr>, ConsumeError> {
     println!("{:?}", path.display());
     let content = std::fs::read_to_string(path).expect("Valid file");
+    println!("{}", content);
     let pairs =
         parser::parse_as_erd(&content).map_err(|e| parser::ConsumeError::ERDParseError(vec![e]))?;
     println!("{:?}", pairs);

diff --git a/examples/attribute.erd b/examples/attribute.erd
@@ -1,2 +1,2 @@
 entity Student
-  attribute Naam
+  attribute Naam
diff --git a/examples/patients.erd b/examples/patients.erd
@@ -0,0 +1,36 @@
+entity patient
+
+entity division
+
+entity room
+
+entity medicin
+
+entity prescription
+
+entity doctor
+
+relation Houses
+  one required division
+  multiple optional room
+
+relation Sleeps(Sleeps in)
+  one required room
+  multiple optional patient
+
+relation Weekly(Gets weekly)
+  one required patient
+  multiple optional prescription
+
+relation PrescriptionMedicin(Contains)
+  one optional prescription
+  multiple required medicin
+
+relation PrescriptionDoctor(Prescribes)
+  one required doctor
+  multiple optional prescription
+
+relation PatientDoctor(Has)
+  multiple optional patient
+  one required doctor
+