johannes/Inventur
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Added add column button

Browse Source
This commit is contained in:
Johannes Randerath
2024-08-28 22:18:53 +02:00
parent 6133499e98
commit 0c2c428ce4
5 changed files with 94 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
inventur_db/src/jrcolumns.rs
View File

@@ -4,7 +4,7 @@ use crate::models;
use crate::schema;
use crate::jrtables;
use models::{ Jrcolumn, NewJrcolumn };
use schema::jrcolumns::dsl::{ jrcolumns, id, name, jrtable_id, id_in_table };
use schema::jrcolumns::dsl::{ jrcolumns, id, name, jrtable_id, id_in_table, column_type };
pub fn create_jrcolumn(conn: &mut MysqlConnection, tblid: i32, clmnname: String, clmtype: crate::FIELDTYPE) -> Result<usize, diesel::result::Error> {
@@ -78,17 +78,17 @@ pub fn get_clmid_relative(conn: &mut MysqlConnection, tblid: i32, idintbl: i32)
.first::<i32>(conn)
}
pub fn rename_column_relative(conn: &mut MysqlConnection, tblid: i32, id_in_tbl: i32, new_name: String) -> Result<usize, diesel::result::Error> {
pub fn edit_column_relative(conn: &mut MysqlConnection, tblid: i32, id_in_tbl: i32, new_name: &String, clmtype: crate::FIELDTYPE) -> Result<usize, diesel::result::Error> {
let clmid = get_clmid_relative(conn, tblid, id_in_tbl);
if clmid.is_err() {
return Err(clmid.err().unwrap());
}
rename_column(conn, clmid.unwrap(), new_name)
edit_column(conn, clmid.unwrap(), new_name, clmtype)
}
pub fn rename_column(conn: &mut MysqlConnection, clmnid: i32, new_name: String) -> Result<usize, diesel::result::Error> {
pub fn edit_column(conn: &mut MysqlConnection, clmnid: i32, new_name: &String, clmtype: crate::FIELDTYPE) -> Result<usize, diesel::result::Error> {
diesel::update(jrcolumns.find(clmnid))
.set(name.eq(new_name))
.set((name.eq(new_name), column_type.eq(clmtype as i32)))
.execute(conn)
}

6
inventur_db/src/lib.rs
View File

@@ -185,7 +185,7 @@ pub fn search_table(tbl: Tbl, search_fields: Vec<i32>, search_value: String) ->
let mut field_sets = HashSet::new();
for field in search_fields {
for row in &rows {
if row.cells[field as usize].to_lowercase().contains(&search_value) {
if row.cells[field as usize].to_lowercase().contains(&search_value.to_lowercase()) {
field_sets.insert(row.clone());
}
}
@@ -405,11 +405,11 @@ pub fn delete_column(conn: &mut MysqlConnection, tblid: i32, column_pos: i32, ui
Some(true)
}
pub fn rename_column(conn: &mut MysqlConnection, tblid: i32, column_pos: i32, new_name: String, uid: i32) -> Option<bool> {
pub fn edit_column(conn: &mut MysqlConnection, tblid: i32, column_pos: i32, new_name: &String, new_type: FIELDTYPE, uid: i32) -> Option<bool> {
let owner = jrtables::get_owner_id(conn, tblid);
if owner.is_err() ||
owner.unwrap() != uid ||
jrcolumns::rename_column_relative(conn, tblid, column_pos, new_name).is_err()
jrcolumns::edit_column_relative(conn, tblid, column_pos, new_name, new_type).is_err()
{
return None;
}