Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Yandex-Practicum/Java-Module-Project
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: MaksBujanov/Java-Module-Project
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dev
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 19 commits
  • 10 files changed
  • 2 contributors

Commits on Nov 27, 2022

  1. Привет Мир2

    @MaksBujanov
    MaksBujanov committed Nov 27, 2022
    Configuration menu
    Copy the full SHA
    33eee81 View commit details
    Browse the repository at this point in the history

  2. Main Ver1. Все подряд.

    @MaksBujanov
    MaksBujanov committed Nov 27, 2022
    Configuration menu
    Copy the full SHA
    1842ea5 View commit details
    Browse the repository at this point in the history

  3. Main Ver2. Все подряд. 

    1. Цикл получить ол-во гостей
2. Цикл Получить название и стоимость товара
3. Наверное калькулятор ...
    @MaksBujanov
    MaksBujanov committed Nov 27, 2022
    2 Configuration menu
    Copy the full SHA
    7f65249 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2022

  1. Main Ver4. пишу склонение по падежам

    @MaksBujanov
    MaksBujanov committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    fd6cf61 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2022

  1. padeg.java ver2 

    + Строковые шаблоны
+ Описание задачи
+ разобраться с автозаменами
    @MaksBujanov
    MaksBujanov committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    e36046e View commit details
    Browse the repository at this point in the history

  2. + equalsIgnoreCase

    @MaksBujanov
    MaksBujanov committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    e12a616 View commit details
    Browse the repository at this point in the history

  3. пишем Calc 

    классы и  методы
    @MaksBujanov
    MaksBujanov committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    0de22fb View commit details
    Browse the repository at this point in the history

  4. Победил Передачу атрибутов из другого класса

    @MaksBujanov
    MaksBujanov committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    d49a0dd View commit details
    Browse the repository at this point in the history

  5. Победил Передачу атрибутов из другого класса

    @MaksBujanov
    MaksBujanov committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    08a74ed View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2022

  1. Переписал Standart.java 

    1. оформил код в методы
2. сиправил вызов метода standart.round(itog) standart.padeg(itog)
3. переименовал класс padeg --> Standart
4. сократил запись equalsIgnoreCase
и т.д.
    @MaksBujanov
    MaksBujanov committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    8cfe53d View commit details
    Browse the repository at this point in the history

  2. Почистил код от пробелов, комментариев, сократил условие в классе Sta… 

    …ndart
    @MaksBujanov
    MaksBujanov committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    7a09aa4 View commit details
    Browse the repository at this point in the history

  3. Автозамена public static double getCheck и static double check

    @MaksBujanov
    MaksBujanov committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    3bb509a View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2022

  1. 01,12,2022

    @MaksBujanov
    MaksBujanov committed Dec 1, 2022
    Configuration menu
    Copy the full SHA
    d6bd8b7 View commit details
    Browse the repository at this point in the history

  2. calculate.addItem(new Item(productName, stoimost)); 

    void addItem(Item item)
item.stoimost;
item.productName;

Сalc.addItem(new Item(item));???стр31 как переписать?
    @MaksBujanov
    MaksBujanov committed Dec 1, 2022
    Configuration menu
    Copy the full SHA
    aa86aba View commit details
    Browse the repository at this point in the history

  3. ошибка со скобкой?

    @MaksBujanov
    MaksBujanov committed Dec 1, 2022
    Configuration menu
    Copy the full SHA
    b25f9a1 View commit details
    Browse the repository at this point in the history

  4. закомментировал не используемые методы

    @MaksBujanov
    MaksBujanov committed Dec 1, 2022
    Configuration menu
    Copy the full SHA
    5729c70 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2022

  1. Сдаем проект. Попытка 1

    @MaksBujanov
    MaksBujanov committed Dec 2, 2022
    Configuration menu
    Copy the full SHA
    c4d1c87 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2023

  1. // class Main доработка замечание 1: проверка на корректный ввод коли… 

    …чества людей 1.нечисловой ввод 2.дробное число

//class Main доработка замечания 2: 1.ввод букв в качестве стоимости 2. ввод отрицательной стоимости 3. любой некорректный ввод
// class Standart доработка замечание 3: склонение. анализируем остатокот деления
    @MaksBujanov
    MaksBujanov committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    507d6bb View commit details
    Browse the repository at this point in the history

  2. Склонение

    @MaksBujanov
    MaksBujanov committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    082f3a4 View commit details
    Browse the repository at this point in the history
Loading