From: Andrea Zagli <azagli@libero.it>
Date: Tue, 7 Feb 2023 15:53:12 +0000 (+0100)
Subject: Rendered html select element.
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=62671fd148e8108704b6ee8e3728e6e10a1de04e;p=rust%2Fzakform

Rendered html select element.
---

diff --git a/Cargo.toml b/Cargo.toml
index ebae6c1..ba086aa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,12 +6,11 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-tera = "1.8.0"
-
-
-[dev-dependencies]
 serde = "1"
 serde_derive = "1"
 serde_json = "1"
+tera = "1.8.0"
+
+[dev-dependencies]
 config = "0.13"
 actix-web = "4"
diff --git a/examples/form.rs b/examples/form.rs
index 661f9a7..8392fcd 100644
--- a/examples/form.rs
+++ b/examples/form.rs
@@ -47,6 +47,7 @@ struct AppState {
 struct FormData {
 	name: String,
 	notes: String,
+	sex: String,
 }
 
 async fn index_post(
@@ -81,6 +82,13 @@ async fn index_post(
 	fi.filter();
 	f.add_field(fi);
 
+	let mut fi = zakform::Field::new(zakform::FType::Select, "sex");
+	fi.set_label("Sex");
+	fi.add_option(zakform::FOption{value: String::from("M"), label: String::from("Male")});
+	fi.add_option(zakform::FOption{value: String::from("F"), label: String::from("Female")});
+	fi.set_value(map.get(fi.name().as_str()).unwrap().as_str());
+	f.add_field(fi);
+
 	let fs = f.fields();
 	for fi in fs {
 		s.push_str(fi.render().as_str());
@@ -121,6 +129,12 @@ async fn index(
 	fi.set_rows(15);
 	f.add_field(fi);
 
+	let mut fi = zakform::Field::new(zakform::FType::Select, "sex");
+	fi.set_label("Sex");
+	fi.add_option(zakform::FOption{value: String::from("M"), label: String::from("Male")});
+	fi.add_option(zakform::FOption{value: String::from("F"), label: String::from("Female")});
+	f.add_field(fi);
+
 	let fs = f.fields();
 	for fi in fs {
 		s.push_str(fi.render().as_str());
diff --git a/src/lib.rs b/src/lib.rs
index 60d2878..43b0f31 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,10 +1,13 @@
+use serde_derive::{Serialize,Deserialize};
+
 use tera::Tera;
 
 pub mod filters;
 
 pub enum FType {
 	Text,
-	TextArea
+	TextArea,
+	Select,
 }
 
 pub struct Field {
@@ -17,10 +20,17 @@ pub struct Field {
 	rows: i32,
 	help: String,
 	value: String,
+	options: Vec<FOption>,
 	tmpl: tera::Tera,
 	filters: Vec<filters::Filter>,
 }
 
+#[derive(Serialize)]
+pub struct FOption {
+	pub value: String,
+	pub label: String,
+}
+
 impl Field {
 	pub fn new(ftype: FType, name: &str) -> Field {
 		let mut f = Field {
@@ -33,6 +43,7 @@ impl Field {
 			rows: 0,
 			help: String::new(),
 			value: String::new(),
+			options: Vec::new(),
 			tmpl: Tera::default(),
 			filters: vec![],
 		};
@@ -52,6 +63,17 @@ impl Field {
  <label for="{{ name }}" class="form-label">{{ label }}</label>{% endif %}
  <textarea class="form-control{%if help %} is-invalid{% endif %}" name="{{ name }}" id="{{ name }}" rows="{{ rows }}">{{ value }}</textarea>
  {% if help %}<div id="helpBox_{{ name }}_" class="invalid-feedback">{{ help }}</div>{% endif %}
+ {% if label %}</div>{% endif %}"#);
+			},
+			FType::Select => {
+				f.tmpl.add_raw_template("field", r#"{% if label %}<div class="mb-3">
+ <label for="{{ name }}" class="form-label">{{ label }}</label><br/>{% endif %}
+ <select class="form-select{% if help %} is-invalid{% endif %}" name="{{ name }}" id="{{ name }}">
+ {% for o in options %}
+ <option value="{{ o.value }}"{% if value == o.value %} selected{% endif %}>{{ o.label }}</option>
+ {% endfor %}
+ </select>
+ {% if help %}<div id="helpBox_{{ name }}_" class="invalid-feedback">{{ help }}</div>{% endif %}
  {% if label %}</div>{% endif %}"#);
 			},
 		}
@@ -119,6 +141,10 @@ impl Field {
 		self.value = String::from(value);
 	}
 
+	pub fn add_option(&mut self, option: FOption) {
+		self.options.push(option);
+	}
+
 	pub fn add_filter(&mut self, filter: filters::Filter) {
 		self.filters.push(filter);
 	}
@@ -141,6 +167,7 @@ impl Field {
 		context.insert("rows", &self.rows);
 		context.insert("help", &self.help);
 		context.insert("value", &self.value);
+		context.insert("options", &self.options);
 		s.push_str(self.tmpl.render("field", &context).unwrap().as_str());
 
 		s