From b511d033f58cd037e9da9110e72c2702a97f47ed Mon Sep 17 00:00:00 2001 From: n0rdye Date: Sat, 12 Aug 2023 22:45:31 +0500 Subject: [PATCH] modified: public/lib/inter.js modified: views/admin/objects/object_groups.ejs modified: views/header.ejs modified: views/load.ejs modified: views/project.ejs modified: views/static/end.ejs modified: views/static/start.ejs --- public/lib/inter.js | 22 ++++++++-- views/admin/objects/object_groups.ejs | 5 ++- views/header.ejs | 52 ++++++++++++++--------- views/load.ejs | 2 + views/project.ejs | 61 +++++++++++++++++++++++---- views/static/end.ejs | 7 +++ views/static/start.ejs | 2 +- 7 files changed, 117 insertions(+), 34 deletions(-) diff --git a/public/lib/inter.js b/public/lib/inter.js index 645ccd0..33ed26b 100644 --- a/public/lib/inter.js +++ b/public/lib/inter.js @@ -52,6 +52,7 @@ function create(clas,x,y,body,id,size){ obj.style.height = `${db_data["height"] * 2}px`; } } + calc_total(); }) root.append(obj); set_pos(obj,x,y); @@ -90,21 +91,35 @@ function wall_size_change(type,value = null){ } } -function calc_total(){ +function calc_total(start = false){ + document.getElementById("cost_list").innerHTML = "" + if (start) { + document.getElementById("proj_cost").setAttribute("value",`стоимость: ${objs["total"]} руб.`); + return; + } let total=0; Object.entries(objs).forEach(([key,value]) => { + // console.log(key); if(key != "height"&&key!="width"&key!="total"){ - // console.log(key,value); // console.log(Object.keys(value).length); // console.log(objs_store[key]); if(objs_store[key] != null){ + // console.log(key,value); total += parseInt(parseInt(objs_store[key]["cost"]) * Object.keys(value).length); + let obj_cost_div = document.createElement("li"); + obj_cost_div.innerHTML = + `
${key.split("/g/")[0].replace("$"," ")}
`+ + `
 ${Object.keys(value).length}x
`+ + `
${parseInt(parseInt(objs_store[key]["cost"]) * Object.keys(value).length)}
`; + document.getElementById("cost_list").append(obj_cost_div); } } // console.log(Object.keys(objs).at(-1)); }); // return total; - document.getElementById("proj_cost").innerText = total; + + objs["total"] = total; + document.getElementById("proj_cost").setAttribute("value",`стоимость: ${total} руб.`); } function load(objss){ @@ -135,7 +150,6 @@ function load(objss){ } }); resize_drags(); - calc_total() } function load_proj_cloud(){ diff --git a/views/admin/objects/object_groups.ejs b/views/admin/objects/object_groups.ejs index 37b8d9c..1de3cdf 100644 --- a/views/admin/objects/object_groups.ejs +++ b/views/admin/objects/object_groups.ejs @@ -1,15 +1,16 @@

группы товаров

-
+
diff --git a/views/header.ejs b/views/header.ejs index f50cdce..cf67433 100644 --- a/views/header.ejs +++ b/views/header.ejs @@ -49,16 +49,19 @@ background: ghostwhite; cursor: pointer; border: 1px black dashed; - padding: 5px; + padding: 2px; + width: 220px; } .cmenu{ - position: fixed; + position: absolute; display: grid; background: ghostwhite; color: black; cursor: pointer; border: 1px black solid; - z-index: 100; + border-top: 0px; + z-index: 500; + /* width: 218px; */ } #top_panel_right_main{ /* float: right; */ @@ -129,27 +132,32 @@
+ \ No newline at end of file diff --git a/views/load.ejs b/views/load.ejs index eaf7f47..11b59a9 100644 --- a/views/load.ejs +++ b/views/load.ejs @@ -53,6 +53,7 @@ logo.style.left = loaded_pos.x; logo.style.top = loaded_pos.y; logo.style.width = loaded_pos.w + load_div.style.height = `${document.getElementsByTagName("body")[0].scrollHeight}px`; } function loading(){ let logo = document.getElementById("load_logo"); @@ -63,5 +64,6 @@ logo.style.left = loading_pos.x; logo.style.top = loading_pos.y; logo.style.width = loading_pos.w + load_div.style.height = `${document.getElementsByTagName("body")[0].scrollHeight}px`; } \ No newline at end of file diff --git a/views/project.ejs b/views/project.ejs index 1efad93..1429268 100644 --- a/views/project.ejs +++ b/views/project.ejs @@ -112,7 +112,6 @@ position: absolute; padding: 0px; margin: 0px; - width: 200px; } @@ -142,6 +141,27 @@
+
+ + +
    +
+ +
@@ -154,14 +174,9 @@
-
 руб.
+
-
- - -
    -
    copy
    back
    @@ -173,6 +188,14 @@
    load
    +
    +
    + + + +
      +
      +
      @@ -182,9 +205,9 @@ function group_drop(){ let e = document.getElementById("group_drop") - // document.getElementById("group").style = `top:${e.getBoundingClientRect().top+40}px;left:${e.getBoundingClientRect().left - 5}px`; setTimeout(()=>{ document.getElementById("group").style.display = "block"; + // document.getElementById("group").style.left = document.getElementById("group_drop").getBoundingClientRect().left; let childs = document.getElementById("group").getElementsByTagName("input"); let i = 0; Object.entries(childs).forEach(([key,value]) => { @@ -201,6 +224,28 @@ }); },1) } + + function cost_drop(id){ + // let e = document.getElementById("cost") + // setTimeout(()=>{ + // document.getElementById("group").style.display = "block"; + // // document.getElementById("group").style.left = document.getElementById("group_drop").getBoundingClientRect().left; + // let childs = document.getElementById("group").getElementsByTagName("input"); + // let i = 0; + // Object.entries(childs).forEach(([key,value]) => { + // console.log(key,value); + // if(value.checked == true){ + // get_objs(value) + // i++; + // } + // if (i==0){ + // document.getElementsByClassName("czones")[0].innerHTML = ""; + // drag_start() + // // e.removeChild(e.getElementsByClassName(value)) + // } + // }); + // },1) + } function wall_color_change(){ let wall = document.getElementById("wall") diff --git a/views/static/end.ejs b/views/static/end.ejs index b3fda01..d456698 100644 --- a/views/static/end.ejs +++ b/views/static/end.ejs @@ -14,6 +14,13 @@ Object.entries(menus).forEach(([key,menu]) => { menu.style.display = "none"; }); + let menu_screen = document.getElementById("top_div"); + menu_screen.style.display = "none"; + } + function open_menu(){ + let menu_screen = document.getElementById("top_div"); + menu_screen.style.display = "block"; + menu_screen.style.height = `${document.getElementsByTagName("body")[0].scrollHeight}px`; } hide_menus(); $('form').on('submit', function(event) { diff --git a/views/static/start.ejs b/views/static/start.ejs index fc6eea6..a40adce 100644 --- a/views/static/start.ejs +++ b/views/static/start.ejs @@ -26,7 +26,7 @@ :root{ --login-inp-w:30vw; --login-inp-h: 7.8vh; - --main-font-size: 1.5vw; + --main-font-size: 1.3vw; } .main{ width: 90vw;