From 2e42584a05480ac03775c3edca6223acce801926 Mon Sep 17 00:00:00 2001 From: Meylis Gazakow Date: Sun, 2 Jan 2022 21:57:41 +0300 Subject: [PATCH] New tables almost done --- shablon/css/main.css | 137 ++++++++- shablon/images/svg/down.svg | 4 + shablon/images/svg/drop_arrow.svg | 4 + shablon/importTable.html | 429 ++++++++++++++++++++++++++- shablon/index.html | 38 ++- shablon/js/main.js | 17 ++ shablon/quoteTable.html | 466 ++++++++++++++++++++---------- 7 files changed, 926 insertions(+), 169 deletions(-) create mode 100644 shablon/images/svg/down.svg create mode 100644 shablon/images/svg/drop_arrow.svg diff --git a/shablon/css/main.css b/shablon/css/main.css index 60d3f9ec2..7744cb52d 100644 --- a/shablon/css/main.css +++ b/shablon/css/main.css @@ -4427,6 +4427,10 @@ li { padding: 100px 0; } +.import { + padding: 50px 0; +} + .export_table { width: 100%; overflow-x: auto; @@ -4439,6 +4443,10 @@ li { text-align: center; } +.export_table table.big_table { + width: 1600px; +} + .export_table thead { background: #E5E7EB; border-bottom: 1px solid #E5E7EB; @@ -4496,12 +4504,24 @@ li { cursor: pointer; background: var(--blue); color: #fff; - font-size: 12px; + font-size: 13px; font-weight: 600; line-height: 1.4; - padding: 7px 10px; + padding: 10px 15px; border-radius: 3px; margin-right: 10px; + border: 1px solid transparent; + + transition: all .2s linear; + -ms-transition: all .2s linear; + -moz-transition: all .2s linear; + -o-transition: all .2s linear; +} + +.table_download:hover { + border-color: var(--blue); + color: var(--blue); + background: #fff; } .table_filter { @@ -4509,8 +4529,8 @@ li { } .table_filter-icon { - width: 32px; - height: 32px; + width: 38px; + height: 38px; border: 1px solid var(--blue); border-radius: 3px; cursor: pointer; @@ -4527,13 +4547,14 @@ li { .table_filter-info { position: absolute; top: 0; - left: -310px; - width: 300px; + left: -200px; + width: 200px; background: #f3f3f3; padding: 20px; border-radius: 5px; display: none; + z-index: 5; } .table_filter-info.active { @@ -4553,6 +4574,7 @@ li { -moz-clip-path: polygon(0 0, 0% 100%, 100% 50%); -o-clip-path: polygon(0 0, 0% 100%, 100% 50%); -webkit-clip-path: polygon(0 0, 0% 100%, 100% 50%); + z-index: 5; } .table_filter-info-title { @@ -4588,6 +4610,20 @@ li { margin-right: 15px; width: calc(100% - 15px); max-width: 200px; + + position: relative; +} + +.table_box-search::after { + content: ''; + position: absolute; + top: 10px; + right: 10px; + background: url("../images/svg/down.svg") no-repeat center; + background-size: contain; + width: 20px; + height: 20px; + pointer-events: none; } .table_box-search:last-child { @@ -5188,6 +5224,22 @@ input::-webkit-calendar-picker-indicator { .term_main-title { font-size: 28px; } + + /* Tables ====================== */ + .export_table table colgroup col:nth-child(2) { + width: 20% !important; + min-width: 20% !important; + } + + .table_box { + flex-wrap: wrap; + -ms-flex-wrap: wrap; + -moz-flex-wrap: wrap; + } + + .table_box-search { + margin-bottom: 20px; + } } @media(max-width: 1000px) { @@ -5657,6 +5709,38 @@ input::-webkit-calendar-picker-indicator { font-size: 14px; margin-bottom: 10px; } + + /* Tables ================================ */ + + .export { + padding-top: 50px; + } + + .table_info-row { + flex-direction: column; + -ms-flex-direction: column; + -moz-flex-direction: column; + + align-items: unset; + } + + .table_info-group { + margin-bottom: 20px; + } + + .table_info-group:last-child { + margin-bottom: 0; + } + + .table_filter-info { + left: 50px; + } + + .table_filter-info::after { + right: unset; + left: -10px; + transform: rotate(180deg); + } } @media(max-width: 900px) { @@ -6265,6 +6349,12 @@ input::-webkit-calendar-picker-indicator { height: 16px; } + /* Tables ==================== */ + + .table_box-search { + max-width: 143px; + } + } @media(max-width: 600px) { @@ -6828,6 +6918,34 @@ input::-webkit-calendar-picker-indicator { .bank_form .additional { padding: 0 0 0 5px; } + + + /* Tables ==================== */ + + .table_box-search { + max-width: calc(50% - 15px); + } + + .w300 { + min-width: calc(100% - 15px) !important; + max-width: calc(100% - 15px) !important; + } + + .table_filter-info { + top: 60px; + left: -80px; + } + + .table_filter-info::after { + left: 50%; + top: -20px; + transform: rotate(270deg) translateX(-50%); + -moz-transform: rotate(270deg) translateX(-50%); + -ms-transform: rotate(270deg) translateX(-50%); + -o-transform: rotate(270deg) translateX(-50%); + -webkit-transform: rotate(270deg) translateX(-50%); + } + } @media(max-width: 420px) { @@ -6971,4 +7089,11 @@ input::-webkit-calendar-picker-indicator { font-size: 12px; } + + /* Tables ==================== */ + + .table_box-search { + max-width: calc(100% - 15px); + } + } diff --git a/shablon/images/svg/down.svg b/shablon/images/svg/down.svg new file mode 100644 index 000000000..636d212a0 --- /dev/null +++ b/shablon/images/svg/down.svg @@ -0,0 +1,4 @@ + + + + diff --git a/shablon/images/svg/drop_arrow.svg b/shablon/images/svg/drop_arrow.svg new file mode 100644 index 000000000..ff1485c76 --- /dev/null +++ b/shablon/images/svg/drop_arrow.svg @@ -0,0 +1,4 @@ + + + + diff --git a/shablon/importTable.html b/shablon/importTable.html index 2fb8470bb..7078cf4fd 100644 --- a/shablon/importTable.html +++ b/shablon/importTable.html @@ -118,11 +118,438 @@ + + + +
-
+
+
+
+

+ Imports +

+
+
+ + +
+ + + + + + + +
+
+
+ +
+
+ +
+ +
+ + + + + + + + +
+ +
+ + + + + + + + + +
+ +
+ + + + + + + + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ 		+
№
+ 		+
Title
+ 		+
Country
+ 		+
Unit
+ 		+
Price
+ 		+
Currency
+ 		+
Registered date
+
1КГ 530х426х324х244,5х139,7; 21х21х35х70 + Головка НКТ 140-70(НКТ 89, 73); ФА 78х52-70 (dwg No.: XTSD201109-0104 REV.01) PU; + EE-1,5; PSL3G; PR-2 в т.ч. включается:Китайкомпл65206.73Доллар США01.11.2021
2“HAKSAN MAKINA” RST-M 1270X86 Цилиндрический + станок с мотором / “HAKSAN MAKINA” RST-M 1270X86 Мotorly silindrik stanokТурцияшт.2562Доллар США01.11.2021
3“MONOTIG 220 ip AC/DC” Однофазный переносной + сварочный аппарат / “MONOTIG 220 ip AC/DC” Bir fazaly elde daşalýan kebşirleýji + enjamТурцияшт.3200Доллар США01.11.2021
4“HAKSAN MAKINA” HPK 60 Станок для выбигания + трубы под профиль / “HAKSAN MAKINA” HPK 60 Тurbany profil görnüşde bükme stanogy + Турцияшт.10738Доллар США01.11.2021
5“HAKSAN MAKINA” КME DG 350 Станок для резки + металла электронный под градус/ “HAKSAN MAKINA” КME DG 350 elektroniki derejeli + demir kesme stanogyТурцияшт.13090Доллар США01.11.2021
6“HAKSAN MAKINA” 60 тонный механический + эксентрический пресс, модель HKM-60 / “HAKSAN MAKINA” 60 tonnalyk mehaniki + eksentrikli pres, modeli HMK-60Турцияшт.14295Доллар США01.11.2021
7“YIGITSAN” Howa kompressory YHD-2000, 2000 + litr, 11 Bar.Турцияшт.21700Доллар США01.11.2021
8“G-WEIKE Tech. Co. LTD” Лазерный сварочный + аппарат LW1500H 1500W IPG / “G-WEIKE Tech. Co. LTD” Lazerlyý kebşirleýji enjam + LW1500H 1500W IPG /Китайшт.27300Доллар США01.11.2021
9“HAKSAN MAKINA” HGL 3106 Гидравлическая + геотиновая ножница / “HAKSAN MAKINA” HGL 3106 Gidrawliki giotin gaýçysyТурцияшт.32900Доллар США01.11.2021
10“YILMAZ MAKINE” “DC 550 SK-H” Iki kelleli + alýumin kesiji bycgy (doly awtomatlaşdyrylan)Турциякомпл44800Доллар США01.11.2021
11“HAKSAN MAKINA” 4R HS 30-180 Гидравлический 4 + ядерный цилиндрический станок / “HAKSAN MAKINA” 4R HS 30-180 Gidrawliki 4 toply + silindrli stanokТурцияшт.53200Доллар США01.11.2021
12“TEKSAN” “TJ750BD (400 VAC)” 50Hz Дизельный + генератор, модель 6М33G750/5 “TEKSAN” “TJ750BD (400 VAC)” 50Hz Dizel generatory, + modeli 6М33G750/5Турцияшт.65800Доллар США01.11.2021
+
diff --git a/shablon/index.html b/shablon/index.html index 173128543..17199c1f8 100644 --- a/shablon/index.html +++ b/shablon/index.html @@ -3915,15 +3915,6 @@
-
@@ -3944,13 +3935,40 @@
+ +
+
+ + Нефтехимия + + + Машиностроение + + + Легкая промышленность + + + Стройматериалы + +
+
+
Контакты
- Тел: +99312446015 +
+

+ Tell: +

+ +
Эл. почта: info@exchange.gov.tm diff --git a/shablon/js/main.js b/shablon/js/main.js index 1e6441396..9feb44aae 100644 --- a/shablon/js/main.js +++ b/shablon/js/main.js @@ -52,6 +52,10 @@ let iti__country_list = document.querySelectorAll('.iti__country-list'); let delete_btn = document.querySelectorAll('.delete'); let delete_modal = document.querySelector('#delete-modal'); +let table_filter_icon = document.querySelector('.table_filter-icon'); +let table_filter_info = document.querySelector('.table_filter-info'); + + // Fixed header ==================================== @@ -189,6 +193,12 @@ window.onclick = function (e) { } } + if (table_filter_info != undefined) { + if (table_filter_info.classList.contains('active') && !e.target.closest('.table_filter-info') && !e.target.closest('.table_filter-icon')) { + table_filter_info.classList.remove('active'); + } + } + if (seller_info != undefined) { if (seller_info.classList.contains('active') && !e.target.closest('.seller_inner')) { seller_info.classList.remove('active'); @@ -300,6 +310,13 @@ if (notification_header != undefined) { }); } +if (table_filter_icon != undefined) { + table_filter_icon.addEventListener('click', function () { + sleep(2).then(() => { + table_filter_info.classList.toggle('active'); + }); + }); +} if (mobile_user_profile != undefined) { mobile_user_profile.addEventListener('click', function () { diff --git a/shablon/quoteTable.html b/shablon/quoteTable.html index acffa7588..5169b1891 100644 --- a/shablon/quoteTable.html +++ b/shablon/quoteTable.html @@ -344,8 +344,6 @@
- -
@@ -414,181 +412,345 @@
- +
+ + - + - - - - - - - - - + + + + + + + + + + + + - - - - + + + - - - - - - - + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + +
№TitleCategoryPaymentSendPointBroker sellerAmount +
№
+ 		+
Title
+ 		+
Category
+ 		+
Country
+ 		+
Payment
+ 		+
Send
+ 		+
Point
+ 		+
Place
+ 		+
Broker seller
+ 		+
Amount
+ 		+
Price
+ 		+
Total
+
1Iodine technical brand "A" (packaging at the +
1Iodine technical brand "А" (packaging at the expense of the buyer) ("Turkmenhimiya" SC) (bid.590391)Petrochemistry productionprepaymentEXWIodine plant "Bereket"107 40 tn Petrochemistry + productionTurkmenistanprepaymentEXWIodine plant "Bereket"Balkan velayat "Bereket" Iodine plant107 + 40 tn + + 45057 + + 1802280 +
2Iodized table salt of the first grade grinding №1 (bid.594905) ("Turkmenhimiya" SC) +
2Iodized table salt of the first grade grinding + №1 (bid.594905) ("Turkmenhimiya" SC)Petrochemistry + productionTurkmenistanprepaymentEXWGuwlyduz factroryGuwlyduz factrory107 + 20000 tn + + 258 + + 5160000 +
3Food salt, tableted, premium (bid.594907) + ("Turkmenhimiya" SC)Petrochemistry + productionTurkmenistanprepaymentEXWGuwlyduz factroryGuwlyduz factrory107 + 5000 tn + + 246 + + 1230000 +
4Oksigumat ("Turkmenhimiya" SC) (bid. 595622) Petrochemistry productionprepaymentEXWGuwlyduz factrory107 20000 tn Petrochemistry + productionTurkmenistanprepaymentEXWChemical plant named S.A.NiyazovChemical plant named S.A.Niyazov107 + 400 tn + + 1143 + + 457200 +
3Food salt, tableted, premium (bid.594907) ("Turkmenhimiya" SC)Petrochemistry productionprepaymentEXWGuwlyduz factrory107 5000 tn
5Technical sulfuric acid ("Turkmenhimiya" SC) + (bid. 595623)Petrochemistry + productionTurkmenistanprepaymentFCAst.ZergerChemical plant named S.A.Niyazov107 + 20000 tn + + 158 + + 3160000 +
4Oksigumat ("Turkmenhimiya" SC) (bid. 595622) Petrochemistry productionprepaymentEXWChemical plant named S.A.Niyazov107 400 tn
6Carbon black brand "K-354" ("Turkmenhimiya" + SC) (bid. 598566)Petrochemistry + productionTurkmenistanprepaymentEXWiodine plant "Balkanabat"iodine plant "Balkanabat"107 + 800 tn + + 2294 + + 1835200 +
5Technical sulfuric acid ("Turkmenhimiya" SC) (bid. 595623)Petrochemistry productionprepaymentFCAst.Zerger107 20000 tn
6Carbon black brand "K-354" ("Turkmenhimiya" SC) (bid. 598566)Petrochemistry productionprepaymentEXWiodine plant "Balkanabat"107 800 tn
7Iodine technical brand "A" (packaging at the - expense of the buyer) ("Turkmenhimiya" SC) (bid.590391)Petrochemistry productionprepaymentEXWIodine plant "Bereket"107 40 tn
8Iodized table salt of the first grade grinding №1 (bid.594905) ("Turkmenhimiya" SC) +
7Bischofite ("Turkmenhimiya" SC) (bid.601256) Petrochemistry productionprepaymentEXWGuwlyduz factrory107 20000 tn Petrochemistry + productionTurkmenistanprepaymentFOBBekdashBalkan velayat107 + 8650 tn + + 124 + + 1072600 +
9Food salt, tableted, premium (bid.594907) ("Turkmenhimiya" SC)Petrochemistry productionprepaymentEXWGuwlyduz factrory107 5000 tn
8Aviation kerosene brand Jet A-1 acc.to price + formula "Platts" "FOB Italy" line "Jet" minimum limi $ 200 USD/tn. (TORC) + (bid.602639)Petrochemistry + productionTurkmenistanprepaymentFCAPA KenarTORC205 + 5000 tn + + 200 + + 1000000 +
10Oksigumat ("Turkmenhimiya" SC) (bid. 595622) Petrochemistry productionprepaymentEXWChemical plant named S.A.Niyazov107 400 tn
9Aviation kerosene brand Jet A-1 acc.to price + formula "Platts" "FOB Italy" line "Jet" minimum limi $ 200 USD/tn. Direction Europe + (TORC) (bid.602641)Petrochemistry + productionTurkmenistanprepaymentFOBInternational port of TurkmenbashyTORC205 + 5000 tn + + 200 + + 1000000 +
11Technical sulfuric acid ("Turkmenhimiya" SC) (bid. 595623)Petrochemistry productionprepaymentFCAst.Zerger107 20000 tn
12Carbon black brand "K-354" ("Turkmenhimiya" SC) (bid. 598566)Petrochemistry productionprepaymentEXWiodine plant "Balkanabat"107 800 tn
10Fine-grained potassium chloride of the "Small" + brand, 1st grade (In bulk) ("Turkmenhimiya" SC) (bid.602692)Petrochemistry + productionTurkmenistanprepaymentEXWLebat veleyat, c.GarlykLebat veleyat, c. Garlyk107 + 10000 tn + + 1640 + + 16400000 +