neiam/ppl: 99d64d3

modified src/data.rs

+30 −32

@@ -60,9 +60,9 @@ impl ContactOps {

60	60	r#type: Set(typ),
61	61	designator: Set(Option::from(designator)),
62	62	value: Set(value),
63		− date_acq: Set(Some(Local::today().naive_local())),
64		− date_ins: Set(Local::today().naive_local()),
65		− date_up: Set(Local::today().naive_local()),
	63	+ date_acq: Set(Some(Local::now().date_naive())),
	64	+ date_ins: Set(Local::now().date_naive()),
	65	+ date_up: Set(Local::now().date_naive()),
66	66	};
67	67
68	68	let pp = p.insert(db).await;

@@ -118,7 +118,7 @@ impl ContactOps {

118	118	am.designator = Set(designator);
119	119	am.r#type = Set(typ);
120	120	am.value = Set(value);
121		− am.date_up = Set(Local::today().naive_local());
	121	+ am.date_up = Set(Local::now().date_naive());
122	122	am.update(db).await?;
123	123	Ok(())
124	124	}

@@ -135,8 +135,8 @@ impl PplOps {

135	135	name: Set(name),
136	136	nick: NotSet,
137	137	me: Set(true),
138		− date_ins: Set(Local::today().naive_local()),
139		− date_up: Set(Local::today().naive_local()),
	138	+ date_ins: Set(Local::now().date_naive()),
	139	+ date_up: Set(Local::now().date_naive()),
140	140	};
141	141	let pp = p.insert(db).await;
142	142	match pp {

@@ -156,8 +156,8 @@ impl PplOps {

156	156	name: Set(name),
157	157	me: Set(false),
158	158	nick: NotSet,
159		− date_ins: Set(Local::today().naive_local()),
160		− date_up: Set(Local::today().naive_local()),
	159	+ date_ins: Set(Local::now().date_naive()),
	160	+ date_up: Set(Local::now().date_naive()),
161	161	};
162	162	let pp = p.insert(db).await;
163	163	match pp {

@@ -190,7 +190,7 @@ impl PplOps {

190	190	None => {}
191	191	Some(i) => am.name = Set(i),
192	192	}
193		− am.date_up = Set(Local::today().naive_local());
	193	+ am.date_up = Set(Local::now().date_naive());
194	194	am.update(db).await?;
195	195	Ok(())
196	196	}

@@ -217,8 +217,8 @@ impl RelationOps {

217	217	r#type: Set(typ),
218	218	date_entered: Set(entered),
219	219	date_ended: Set(ended),
220		− date_ins: Set(Local::today().naive_local()),
221		− date_up: Set(Local::today().naive_local()),
	220	+ date_ins: Set(Local::now().date_naive()),
	221	+ date_up: Set(Local::now().date_naive()),
222	222	superseded: Set(superseded),
223	223	};
224	224	let pp = p.insert(db).await;

@@ -289,7 +289,7 @@ impl RelationOps {

289	289	Some(date) => am.date_ended = Set(Option::from(date)),
290	290	}
291	291	am.r#type = Set(typ);
292		− am.date_up = Set(Local::today().naive_local());
	292	+ am.date_up = Set(Local::now().date_naive());
293	293	am.update(db).await?;
294	294	Ok(())
295	295	}

@@ -314,8 +314,8 @@ impl SigDateOps {

314	314	event: Set(event),
315	315	do_remind: Set(do_remind),
316	316	with_ppl: Default::default(),
317		− date_ins: Set(Local::today().naive_local()),
318		− date_up: Set(Local::today().naive_local()),
	317	+ date_ins: Set(Local::now().date_naive()),
	318	+ date_up: Set(Local::now().date_naive()),
319	319	};
320	320
321	321	let pp = p.insert(db).await;

@@ -366,7 +366,7 @@ impl SigDateOps {

366	366	am.event = Set(event);
367	367	am.date = Set(date.unwrap_or_default());
368	368	am.do_remind = Set(do_remind);
369		− am.date_up = Set(Local::today().naive_local());
	369	+ am.date_up = Set(Local::now().date_naive());
370	370	am.update(db).await?;
371	371	Ok(())
372	372	}

@@ -388,8 +388,8 @@ impl TierOps {

388	388	name: Set(tier.to_string()),
389	389	color: Default::default(),
390	390	symbol: Default::default(),
391		− date_ins: Set(Local::today().naive_local()),
392		− date_up: Set(Local::today().naive_local()),
	391	+ date_ins: Set(Local::now().date_naive()),
	392	+ date_up: Set(Local::now().date_naive()),
393	393	};
394	394	let tt = t.insert(db).await;
395	395	match tt {

@@ -436,7 +436,7 @@ impl TierOps {

436	436	am.name = Set(name);
437	437	am.color = Set(color);
438	438	am.symbol = Set(symbol);
439		− am.date_up = Set(Local::today().naive_local());
	439	+ am.date_up = Set(Local::now().date_naive());
440	440	am.update(db).await?;
441	441	Ok(())
442	442	}

@@ -460,8 +460,8 @@ impl TraitOps {

460	460	key: Set(key.to_string()),
461	461	value: Set(value),
462	462	hidden: Set(hidden),
463		− date_ins: Set(Local::today().naive_local()),
464		− date_up: Set(Local::today().naive_local()),
	463	+ date_ins: Set(Local::now().date_naive()),
	464	+ date_up: Set(Local::now().date_naive()),
465	465	};
466	466	let tt = t.insert(db).await;
467	467	match tt {

@@ -512,7 +512,7 @@ impl TraitOps {

512	512	Some(j) => am.value = Set(j),
513	513	}
514	514	am.hidden = Set(hidden);
515		− am.date_up = Set(Local::today().naive_local());
	515	+ am.date_up = Set(Local::now().date_naive());
516	516	am.update(db).await?;
517	517	Ok(())
518	518	}

@@ -526,7 +526,6 @@ impl TierDefaultOps {

526	526	pub async fn create(
527	527	db: &DatabaseConnection,
528	528	key: String,
529		− value: String,
530	529	default: bool,
531	530	enabled: bool,
532	531	color: String,

@@ -534,13 +533,13 @@ impl TierDefaultOps {

534	533	) -> Result<(), PplError> {
535	534	let t = tier_defaults::ActiveModel {
536	535	id: Default::default(),
537		− key: Default::default(),
538		− default: Default::default(),
539		− enabled: Default::default(),
540		− color: Default::default(),
541		− symbol: Default::default(),
542		− date_ins: Set(Local::today().naive_local()),
543		− date_up: Set(Local::today().naive_local()),
	536	+ key: Set(key),
	537	+ default: Set(default),
	538	+ enabled: Set(enabled),
	539	+ color: Set(Option::from(color)),
	540	+ symbol: Set(Option::from(symbol)),
	541	+ date_ins: Set(Local::now().date_naive()),
	542	+ date_up: Set(Local::now().date_naive()),
544	543	};
545	544	let tt = t.insert(db).await;
546	545	match tt {

@@ -565,7 +564,6 @@ pub struct TraitDefaultOps {}

565	564	impl TraitDefaultOps {
566	565	pub async fn create(
567	566	db: &DatabaseConnection,
568		− ppl_id: i32,
569	567	key: String,
570	568	color: String,
571	569	symbol: String,

@@ -583,8 +581,8 @@ impl TraitDefaultOps {

583	581	is_contact: Set(is_contact),
584	582	color: Set(color),
585	583	symbol: Set(symbol),
586		− date_ins: Set(Local::today().naive_local()),
587		− date_up: Set(Local::today().naive_local()),
	584	+ date_ins: Set(Local::now().date_naive()),
	585	+ date_up: Set(Local::now().date_naive()),
588	586	};
589	587	let tt = t.insert(db).await;
590	588	match tt {

modified src/do_init.rs

+23 −27

@@ -249,9 +249,6 @@ impl fmt::Display for DefaultTiers {

249	249	write!(f, "{:?}", self)
250	250	}
251	251	}
252		−
253		−fn handle_key_event(key_event: KeyEvent) {}
254		−
255	252	pub async fn run_init(
256	253	mut terminal: DefaultTerminal,
257	254	db: DatabaseConnection,

@@ -374,8 +371,8 @@ pub async fn run_init(

374	371	key: Set("alias".to_string()),
375	372	value: Set(alias.clone()),
376	373	hidden: Set(false),
377		− date_ins: Set(Local::today().naive_local()),
378		− date_up: Set(Local::today().naive_local()),
	374	+ date_ins: Set(Local::now().date_naive()),
	375	+ date_up: Set(Local::now().date_naive()),
379	376	})
380	377	.collect::<Vec<traits::ActiveModel>>();
381	378	let aliases = Traits::insert_many(alias_am).exec(&db).await;

@@ -398,8 +395,8 @@ pub async fn run_init(

398	395	event: Set("birthday".to_string()),
399	396	do_remind: Set(true),
400	397	with_ppl: Default::default(),
401		− date_ins: Set(Local::today().naive_local()),
402		− date_up: Set(Local::today().naive_local()),
	398	+ date_ins: Set(Local::now().date_naive()),
	399	+ date_up: Set(Local::now().date_naive()),
403	400	};
404	401
405	402	let bb = b.insert(&db).await;

@@ -418,9 +415,9 @@ pub async fn run_init(

418	415	r#type: Set("address".to_string()),
419	416	designator: Default::default(),
420	417	value: Set(app.place.clone()),
421		− date_acq: Set(Some(Local::today().naive_local())),
422		− date_ins: Set(Local::today().naive_local()),
423		− date_up: Set(Local::today().naive_local()),
	418	+ date_acq: Set(Some(Local::now().date_naive())),
	419	+ date_ins: Set(Local::now().date_naive()),
	420	+ date_up: Set(Local::now().date_naive()),
424	421	};
425	422	//
426	423	let plpl = pl.insert(&db).await;

@@ -439,8 +436,8 @@ pub async fn run_init(

439	436	name: Set(ofppl.clone()),
440	437	me: Set(false),
441	438	nick: NotSet,
442		− date_ins: Set(Local::today().naive_local()),
443		− date_up: Set(Local::today().naive_local()),
	439	+ date_ins: Set(Local::now().date_naive()),
	440	+ date_up: Set(Local::now().date_naive()),
444	441	};
445	442	let ofof = of.insert(&db).await;
446	443	match ofof {

@@ -458,8 +455,8 @@ pub async fn run_init(

458	455	date_entered: Set(Option::from(app.bday)),
459	456	date_ended: Default::default(),
460	457	superseded: Set(false),
461		− date_ins: Set(Local::today().naive_local()),
462		− date_up: Set(Local::today().naive_local()),
	458	+ date_ins: Set(Local::now().date_naive()),
	459	+ date_up: Set(Local::now().date_naive()),
463	460	};
464	461
465	462	let rr = r.insert(&db).await;

@@ -493,8 +490,8 @@ pub async fn run_init(

493	490	name: Set(ofppl.clone()),
494	491	me: Set(false),
495	492	nick: NotSet,
496		− date_ins: Set(Local::today().naive_local()),
497		− date_up: Set(Local::today().naive_local()),
	493	+ date_ins: Set(Local::now().date_naive()),
	494	+ date_up: Set(Local::now().date_naive()),
498	495	};
499	496	let ofof = of.insert(&db).await;
500	497	match ofof {

@@ -512,8 +509,8 @@ pub async fn run_init(

512	509	date_entered: Set(None),
513	510	date_ended: Default::default(),
514	511	superseded: Set(false),
515		− date_ins: Set(Local::today().naive_local()),
516		− date_up: Set(Local::today().naive_local()),
	512	+ date_ins: Set(Local::now().date_naive()),
	513	+ date_up: Set(Local::now().date_naive()),
517	514	};
518	515
519	516	let rr = r.insert(&db).await;

@@ -553,8 +550,8 @@ pub async fn run_init(

553	550	enabled: Set(true),
554	551	color: Default::default(),
555	552	symbol: Default::default(),
556		− date_ins: Set(Local::today().naive_local()),
557		− date_up: Set(Local::today().naive_local()),
	553	+ date_ins: Set(Local::now().date_naive()),
	554	+ date_up: Set(Local::now().date_naive()),
558	555	})
559	556	.collect::<Vec<tier_defaults::ActiveModel>>();
560	557

@@ -584,8 +581,8 @@ pub async fn run_init(

584	581	is_contact: Set(dtrait.is_contact),
585	582	color: Set(dtrait.color.clone()),
586	583	symbol: Set(dtrait.symbol.clone()),
587		− date_ins: Set(Local::today().naive_local()),
588		− date_up: Set(Local::today().naive_local()),
	584	+ date_ins: Set(Local::now().date_naive()),
	585	+ date_up: Set(Local::now().date_naive()),
589	586	})
590	587	.collect::<Vec<trait_defaults::ActiveModel>>();
591	588

@@ -612,8 +609,8 @@ pub async fn run_init(

612	609	// is_contact: Set(dtrait.is_contact),
613	610	// color: Set(dtrait.color.clone()),
614	611	// symbol: Set(dtrait.symbol.clone()),
615		− // date_ins: Set(Local::today().naive_local()),
616		− // date_up: Set(Local::today().naive_local()),
	612	+ // date_ins: Set(Local::now().date_naive()),
	613	+ // date_up: Set(Local::now().date_naive()),
617	614	// };
618	615	//
619	616	// let trttrt: trait_default::Model = trt.insert(&db).await?;

@@ -835,9 +832,9 @@ fn render(f: &mut Frame, app: &mut Init) {

835	832	messages.extend(app.debugmsgs.clone());
836	833	let messages_v: Vec<ListItem> = messages
837	834	.iter()
838		− .filter(\|(t, i)\| **i != "".to_string())
	835	+ .filter(\|(_t, i)\| **i != "".to_string())
839	836	.enumerate()
840		− .map(\|(i, (t, m))\| {
	837	+ .map(\|(_i, (t, m))\| {
841	838	let content = vec![Line::from(vec![
842	839	Span::styled(t, Style::default().add_modifier(Modifier::BOLD)),
843	840	Span::raw(format!(": {}", m)),

@@ -1020,7 +1017,6 @@ fn render(f: &mut Frame, app: &mut Init) {

1020	1017	}
1021	1018	const TEXT_FG_COLOR: Color = SLATE.c200;
1022	1019	const COMPLETED_TEXT_FG_COLOR: Color = GREEN.c500;
1023		−const BLUEBLUE: Color = BLUE.c500;
1024	1020
1025	1021	pub fn lcolor(input: &String) -> Color {
1026	1022	match input.to_lowercase().as_str() {

modified src/do_tui.rs

+5 −7

@@ -9,15 +9,14 @@ use crate::entities::{

9	9	};
10	10	use crate::PplError;
11	11	use chrono::{Datelike, NaiveDate};
12		−use color_eyre::owo_colors::OwoColorize;
13	12	use crossterm::event;
14	13	use crossterm::event::{Event, KeyCode, KeyEvent, KeyEventKind};
15	14	use enum_iterator::{next, Sequence};
16	15	use itertools::Itertools;
17	16	use ratatui::prelude::{Constraint, Direction, Layout, Line, Modifier, Span, Style, Stylize, Text};
18	17	use ratatui::style::palette::material::AMBER;
19		−use ratatui::style::palette::tailwind::{GREEN, ORANGE, PINK, SLATE, TEAL, WHITE};
20		−use ratatui::style::{Color, Styled};
	18	+use ratatui::style::palette::tailwind::{GREEN, ORANGE, PINK, SLATE, WHITE};
	19	+use ratatui::style::{Color};
21	20	use ratatui::widgets::calendar::{CalendarEventStore, Monthly};
22	21	use ratatui::widgets::{Block, Borders, List, ListDirection, ListItem, ListState, Paragraph};
23	22	use ratatui::{DefaultTerminal, Frame};

@@ -545,7 +544,7 @@ fn render(f: &mut Frame, app: &mut Tui) {

545	544	Span::raw(t.name.clone()),
546	545	])),
547	546	// _ => {}
548		− (Some(main), Some(other)) => msgs.push(Line::from(vec![
	547	+ (Some(main), Some(_other)) => msgs.push(Line::from(vec![
549	548	Span::styled(
550	549	format!("{} {}: ", main, t.name.clone()),
551	550	Style::default().add_modifier(Modifier::BOLD).fg(WHITE),

@@ -870,9 +869,9 @@ fn render(f: &mut Frame, app: &mut Tui) {

870	869	let as_upcoming = &app
871	870	.sigdate_list
872	871	.iter()
873		− .map(\|mut d\| {
	872	+ .map(\|d\| {
874	873	let mut n = d.clone();
875		− n.date = NaiveDate::from_ymd(start.year(), n.date.month(), n.date.day());
	874	+ n.date = NaiveDate::from_ymd_opt(start.year(), n.date.month(), n.date.day()).unwrap();
876	875	let p = app
877	876	.ppl_list
878	877	.iter()

@@ -977,7 +976,6 @@ fn render(f: &mut Frame, app: &mut Tui) {

977	976
978	977	f.render_stateful_widget(ppl, chunks[1], &mut app.def_trait_state);
979	978	}
980		− _ => {}
981	979	}
982	980	}
983	981

modified src/main.rs

+1 −1

@@ -119,7 +119,7 @@ async fn main() -> Result<(), PplError> {

119	119	}
120	120	},
121	121	Some(Commands::Add(args)) => {
122		− do_add(args, db).await;
	122	+ let _ = do_add(args, db).await;
123	123	}
124	124	Some(Commands::Aug) => {}
125	125	Some(Commands::Tui) => {

neiam /ppl

warning cleanup.

Files changed