Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Button save #43

Open
wants to merge 15 commits into
base: artem-14-branch
Choose a base branch
from
10 changes: 5 additions & 5 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -78,26 +78,26 @@ <h2 class="nav__dateMonEar-today"> Dec-2019 </h2>

</div>
<div class="popup-layer">
<form class="popup event" data-id-event="">
<form class="popup event" id="popup">
<span class="popup__btn-close"><img class="close"
src="https://img.icons8.com/color/48/000000/close-window.png"></span>
<input class="event__name" name="eventName" type="text" placeholder="Add title ">
<div class="popup__picker">
<img class="clock" src="https://img.icons8.com/pastel-glyph/64/000000/time.png">
<input class="event__date-start specialDate" name="eventDateStart" required type="date">
<select class="event__time-start hours select" size="1" name="eventTimeStart"></select>
<select class="event__time-start hours select" size="1" name="eventTimeStart"></select>
<span>:</span>
<select class="event__time-min-start minutes select" size="1" name="eventTimeStartMin"></select>
<span class='line'></span>
<select class="event__time-end hours select" name="eventTimeEnd"></select>
<span>:</span>
<select class="event__time-min-end minutes select" size="1" name="eventTimeStartMin" ></select>
<select class="event__time-min-end minutes select" size="1" name="eventTimeEndMin"></select>
<input class="event__date-end specialDate" name="eventDateEnd" required type="date">

</div>
<img class="multiline" src="https://img.icons8.com/windows/32/000000/multiline-text.png">
<input type="text" class="multiline__text" placeholder="add description">
<input type="text" name="desciption" class="multiline__text" placeholder="add description">
<div class="footer-popup">
<p class="validate_string"></p>
<span class="event__btn-delete"><img class="bascket"
src="https://img.icons8.com/windows/32/000000/trash.png"></span>
<button class="event__btn-save btn_save">Save</button>
Expand Down
1 change: 1 addition & 0 deletions main.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion main.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions src/scripts/create_button.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
const createButton = document.querySelector('.nav__button');
const popupBlock = document.querySelector('.popup-layer');
const saveBtn = document.querySelector('.event__btn-save');

export const funcForTimeOptions = () => {
const hours = document.querySelectorAll('.hours');
let hourArr = [];
for(let i = 0; i <= 24; i++){
for (let i = 0; i <= 24; i++) {
let temp = `
<option class="opt-hr">${i}</option>
`;
Expand All @@ -14,31 +14,31 @@ export const funcForTimeOptions = () => {
[...hours].forEach(elem => elem.innerHTML = hourArr.join(''));
const minutes = document.querySelectorAll('.minutes');
let minArr = [];
let counterMin = 0;
while(counterMin < 60){
let counterMin = '00';
while (counterMin < 60) {
let temp = `
<option class="opt-min">${counterMin}</option>
`;
minArr.push(temp);
counterMin += 15;
counterMin = parseInt(counterMin) + 15;
}
[...minutes].forEach(elem => elem.innerHTML = minArr.join(''));
};
};


export const funcForCreateButton = () => {
funcForTimeOptions();
const startHour = new Date().getHours();
const endHour = startHour+1;
const endHour = startHour + 1;
const startHours = document.querySelectorAll('.event__time-start > .opt-hr');
[...startHours].forEach(elem => {
if(elem.innerHTML === startHour.toString()){
if (elem.innerHTML === startHour.toString()) {
elem.parentNode.value = startHour.toString();
}
});
const endHours = document.querySelectorAll('.event__time-end > .opt-hr');
[...endHours].forEach(elem => {
if(elem.innerHTML === endHour.toString()){
if (elem.innerHTML === endHour.toString()) {
elem.parentNode.value = endHour.toString();
}
});
Expand All @@ -49,4 +49,4 @@ export const funcForCreateButton = () => {
const today = new Date();
[...myDate].forEach(elem => elem.value = today.toISOString().substr(0, 10));
};
createButton.addEventListener('click', funcForCreateButton);
createButton.addEventListener('click', funcForCreateButton);
13 changes: 8 additions & 5 deletions src/scripts/delete_event.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { indexOfElement, addintionalIndexOfElem } from './edit_event.js';
import { funcToMakeMarkNull } from './edit_event.js';
import { indexOfElement, markVariable } from './edit_event.js';
import { funcForMakeindexOfElementNull, funcForMakeMarkVariableNull } from './edit_event.js';
import { eventsArray } from './storage.js';
import { renderEventObject, clearFunc } from './generate_event_object.js';
import { renderRedLIne } from './redline.js';
Expand All @@ -9,13 +9,16 @@ const popupBlock = document.querySelector('.popup-layer');
const saveBtnForEdit = document.querySelector('.event__btn-save_after_edit');

export const funcForDeleteEvene = () => {
eventsArray.splice(indexOfElement,1);

if(markVariable === 1){
eventsArray.splice(indexOfElement,1);
eventsArray.splice(indexOfElement-1,1);
}else eventsArray.splice(indexOfElement,1);
funcForMakeindexOfElementNull();
clearFunc();
renderEventObject(eventsArray);
funcForMakeMarkVariableNull();
popupBlock.style.display = 'none';
saveBtnForEdit.style.display = 'none';
renderRedLIne();
funcToMakeMarkNull();
};
deleteBasket.addEventListener('click', funcForDeleteEvene);
Loading