diff --git a/img/api_dasense.png b/img/api_dasense.png new file mode 100644 index 0000000..e987bbc Binary files /dev/null and b/img/api_dasense.png differ diff --git a/img/eclipse.png b/img/eclipse.png new file mode 100644 index 0000000..a3d8c3f Binary files /dev/null and b/img/eclipse.png differ diff --git a/img/git_branch.png b/img/git_branch.png new file mode 100644 index 0000000..259f980 Binary files /dev/null and b/img/git_branch.png differ diff --git a/img/git_console.png b/img/git_console.png new file mode 100644 index 0000000..4fde435 Binary files /dev/null and b/img/git_console.png differ diff --git a/img/git_smartgit.png b/img/git_smartgit.png new file mode 100644 index 0000000..5454fc0 Binary files /dev/null and b/img/git_smartgit.png differ diff --git a/img/git_stapel.jpg b/img/git_stapel.jpg new file mode 100644 index 0000000..65e5e1e Binary files /dev/null and b/img/git_stapel.jpg differ diff --git a/img/git_tortoisegit.png b/img/git_tortoisegit.png new file mode 100644 index 0000000..513d63f Binary files /dev/null and b/img/git_tortoisegit.png differ diff --git a/img/git_workflow.png b/img/git_workflow.png new file mode 100644 index 0000000..d5ace77 Binary files /dev/null and b/img/git_workflow.png differ diff --git a/img/github_system.png b/img/github_system.png new file mode 100644 index 0000000..fdd7210 Binary files /dev/null and b/img/github_system.png differ diff --git a/img/heidisql.png b/img/heidisql.png new file mode 100644 index 0000000..500240c Binary files /dev/null and b/img/heidisql.png differ diff --git a/img/navicat.png b/img/navicat.png new file mode 100644 index 0000000..e503f72 Binary files /dev/null and b/img/navicat.png differ diff --git a/img/nb.png b/img/nb.png new file mode 100644 index 0000000..654a51b Binary files /dev/null and b/img/nb.png differ diff --git a/img/phpmyadmin.jpg b/img/phpmyadmin.jpg new file mode 100644 index 0000000..d1bb733 Binary files /dev/null and b/img/phpmyadmin.jpg differ diff --git a/img/phpstorm.png b/img/phpstorm.png new file mode 100644 index 0000000..13eaf2b Binary files /dev/null and b/img/phpstorm.png differ diff --git a/img/qp.png b/img/qp.png new file mode 100644 index 0000000..b501e82 Binary files /dev/null and b/img/qp.png differ diff --git a/img/qq.png b/img/qq.png new file mode 100644 index 0000000..ac18f16 Binary files /dev/null and b/img/qq.png differ diff --git a/img/sql_system_api.png b/img/sql_system_api.png new file mode 100644 index 0000000..22e9d17 Binary files /dev/null and b/img/sql_system_api.png differ diff --git a/system_php_framework.aux b/system_php_framework.aux index ec0ca05..bf7fbf3 100644 --- a/system_php_framework.aux +++ b/system_php_framework.aux @@ -113,62 +113,86 @@ \@writefile{nav}{\headcommand {\beamer@framepages {31}{31}}} \@writefile{nav}{\headcommand {\slideentry {4}{1}{3}{32/32}{Was ist Versionskontrolle?}{0}}} \@writefile{nav}{\headcommand {\beamer@framepages {32}{32}}} -\@writefile{nav}{\headcommand {\beamer@subsectionentry {0}{4}{2}{33}{Features}}\headcommand {\beamer@subsectionpages {30}{32}}} -\@writefile{nav}{\headcommand {\slideentry {4}{2}{1}{33/33}{Features}{0}}} +\@writefile{nav}{\headcommand {\slideentry {4}{1}{4}{33/33}{Was ist Versionskontrolle?}{0}}} \@writefile{nav}{\headcommand {\beamer@framepages {33}{33}}} -\@writefile{toc}{\beamer@sectionintoc {5}{Software Empfehlungen}{34}{0}{4}} -\@writefile{nav}{\headcommand {\sectionentry {5}{Software Empfehlungen}{34}{Software Empfehlungen}{0}}} -\@writefile{nav}{\headcommand {\beamer@sectionpages {29}{33}}} -\@writefile{nav}{\headcommand {\beamer@subsectionpages {33}{33}}} -\@writefile{nav}{\headcommand {\slideentry {5}{0}{1}{34/34}{}{0}}} +\@writefile{nav}{\headcommand {\slideentry {4}{1}{5}{34/34}{Was ist Versionskontrolle?}{0}}} \@writefile{nav}{\headcommand {\beamer@framepages {34}{34}}} -\@writefile{nav}{\headcommand {\beamer@subsectionentry {0}{5}{1}{35}{Entwicklungsumgebung}}\headcommand {\beamer@subsectionpages {34}{34}}} -\@writefile{nav}{\headcommand {\slideentry {5}{1}{1}{35/35}{Entwicklungsumgebung}{0}}} +\@writefile{nav}{\headcommand {\beamer@subsectionentry {0}{4}{2}{35}{Features}}\headcommand {\beamer@subsectionpages {30}{34}}} +\@writefile{nav}{\headcommand {\slideentry {4}{2}{1}{35/35}{Features}{0}}} \@writefile{nav}{\headcommand {\beamer@framepages {35}{35}}} -\@writefile{nav}{\headcommand {\slideentry {5}{1}{2}{36/36}{Entwicklungsumgebung}{0}}} +\@writefile{nav}{\headcommand {\slideentry {4}{2}{2}{36/36}{Features}{0}}} \@writefile{nav}{\headcommand {\beamer@framepages {36}{36}}} -\@writefile{nav}{\headcommand {\beamer@subsectionentry {0}{5}{2}{37}{Versionskontrolle}}\headcommand {\beamer@subsectionpages {35}{36}}} -\@writefile{nav}{\headcommand {\slideentry {5}{2}{1}{37/37}{Versionskontrolle}{0}}} +\@writefile{toc}{\beamer@sectionintoc {5}{Software Empfehlungen}{37}{0}{4}} +\@writefile{nav}{\headcommand {\sectionentry {5}{Software Empfehlungen}{37}{Software Empfehlungen}{0}}} +\@writefile{nav}{\headcommand {\beamer@sectionpages {29}{36}}} +\@writefile{nav}{\headcommand {\beamer@subsectionpages {35}{36}}} +\@writefile{nav}{\headcommand {\slideentry {5}{0}{1}{37/37}{}{0}}} \@writefile{nav}{\headcommand {\beamer@framepages {37}{37}}} -\@writefile{nav}{\headcommand {\beamer@subsectionentry {0}{5}{3}{38}{SQL Client}}\headcommand {\beamer@subsectionpages {37}{37}}} -\@writefile{nav}{\headcommand {\slideentry {5}{3}{1}{38/38}{SQL Client}{0}}} +\@writefile{nav}{\headcommand {\beamer@subsectionentry {0}{5}{1}{38}{Versionskontrolle}}\headcommand {\beamer@subsectionpages {37}{37}}} +\@writefile{nav}{\headcommand {\slideentry {5}{1}{1}{38/38}{Versionskontrolle}{0}}} \@writefile{nav}{\headcommand {\beamer@framepages {38}{38}}} -\@writefile{nav}{\headcommand {\partentry {Anhang}{1}}} -\@writefile{nav}{\headcommand {\beamer@partpages {1}{38}}} -\@writefile{nav}{\headcommand {\beamer@sectionpages {34}{38}}} -\@writefile{nav}{\headcommand {\beamer@subsectionpages {38}{38}}} -\@writefile{nav}{\headcommand {\beamer@appendixpages {39}}} -\@writefile{nav}{\headcommand {\sectionentry {6}{Outro}{39}{Outro}{1}}} -\@writefile{nav}{\headcommand {\beamer@sectionpages {39}{38}}} -\@writefile{nav}{\headcommand {\beamer@subsectionpages {39}{38}}} -\@writefile{nav}{\headcommand {\slideentry {6}{0}{1}{39/39}{}{1}}} +\@writefile{nav}{\headcommand {\slideentry {5}{1}{2}{39/39}{Versionskontrolle}{0}}} \@writefile{nav}{\headcommand {\beamer@framepages {39}{39}}} -\@writefile{nav}{\headcommand {\beamer@subsectionentry {1}{6}{1}{40}{Fragen}}\headcommand {\beamer@subsectionpages {39}{39}}} -\@writefile{nav}{\headcommand {\slideentry {6}{1}{1}{40/40}{Fragen}{1}}} +\@writefile{nav}{\headcommand {\slideentry {5}{1}{3}{40/40}{Versionskontrolle}{0}}} \@writefile{nav}{\headcommand {\beamer@framepages {40}{40}}} -\@writefile{nav}{\headcommand {\beamer@subsectionentry {1}{6}{2}{41}{Danke}}\headcommand {\beamer@subsectionpages {40}{40}}} -\@writefile{nav}{\headcommand {\slideentry {6}{2}{1}{41/41}{Danke}{1}}} +\@writefile{nav}{\headcommand {\slideentry {5}{1}{4}{41/41}{Versionskontrolle}{0}}} \@writefile{nav}{\headcommand {\beamer@framepages {41}{41}}} -\@writefile{toc}{\beamer@sectionintoc {7}{Gems}{42}{1}{5}} -\@writefile{nav}{\headcommand {\sectionentry {7}{Gems}{42}{Gems}{1}}} -\@writefile{nav}{\headcommand {\beamer@sectionpages {39}{41}}} -\@writefile{nav}{\headcommand {\beamer@subsectionpages {41}{41}}} -\@writefile{nav}{\headcommand {\slideentry {7}{0}{1}{42/42}{}{1}}} +\@writefile{nav}{\headcommand {\beamer@subsectionentry {0}{5}{2}{42}{Entwicklungsumgebung}}\headcommand {\beamer@subsectionpages {38}{41}}} +\@writefile{nav}{\headcommand {\slideentry {5}{2}{1}{42/42}{Entwicklungsumgebung}{0}}} \@writefile{nav}{\headcommand {\beamer@framepages {42}{42}}} -\@writefile{toc}{\beamer@subsectionintoc {7}{1}{API - REST in System}{43}{1}{5}} -\@writefile{nav}{\headcommand {\beamer@subsectionentry {1}{7}{1}{43}{API - REST in System}}\headcommand {\beamer@subsectionpages {42}{42}}} -\@writefile{nav}{\headcommand {\slideentry {7}{1}{1}{43/43}{API - REST in System}{1}}} +\@writefile{nav}{\headcommand {\slideentry {5}{2}{2}{43/43}{Entwicklungsumgebung}{0}}} \@writefile{nav}{\headcommand {\beamer@framepages {43}{43}}} -\@writefile{toc}{\beamer@subsectionintoc {7}{2}{Quick Query - Sichere SQL Querys}{44}{1}{5}} -\@writefile{nav}{\headcommand {\beamer@subsectionentry {1}{7}{2}{44}{Quick Query - Sichere SQL Querys}}\headcommand {\beamer@subsectionpages {43}{43}}} -\@writefile{nav}{\headcommand {\slideentry {7}{2}{1}{44/44}{Quick Query - Sichere SQL Querys}{1}}} +\@writefile{nav}{\headcommand {\slideentry {5}{2}{3}{44/44}{Entwicklungsumgebung}{0}}} \@writefile{nav}{\headcommand {\beamer@framepages {44}{44}}} -\@writefile{toc}{\beamer@subsectionintoc {7}{3}{Kapselung in System - Eine Seite}{45}{1}{5}} -\@writefile{nav}{\headcommand {\beamer@subsectionentry {1}{7}{3}{45}{Kapselung in System - Eine Seite}}\headcommand {\beamer@subsectionpages {44}{44}}} -\@writefile{nav}{\headcommand {\slideentry {7}{3}{1}{45/45}{Kapselung in System - Eine Seite}{1}}} +\@writefile{nav}{\headcommand {\slideentry {5}{2}{4}{45/45}{Entwicklungsumgebung}{0}}} \@writefile{nav}{\headcommand {\beamer@framepages {45}{45}}} -\@writefile{nav}{\headcommand {\beamer@partpages {39}{45}}} -\@writefile{nav}{\headcommand {\beamer@subsectionpages {45}{45}}} -\@writefile{nav}{\headcommand {\beamer@sectionpages {42}{45}}} -\@writefile{nav}{\headcommand {\beamer@documentpages {45}}} -\@writefile{nav}{\headcommand {\def \inserttotalframenumber {45}}} +\@writefile{nav}{\headcommand {\slideentry {5}{2}{5}{46/46}{Entwicklungsumgebung}{0}}} +\@writefile{nav}{\headcommand {\beamer@framepages {46}{46}}} +\@writefile{nav}{\headcommand {\beamer@subsectionentry {0}{5}{3}{47}{SQL Client}}\headcommand {\beamer@subsectionpages {42}{46}}} +\@writefile{nav}{\headcommand {\slideentry {5}{3}{1}{47/47}{SQL Client}{0}}} +\@writefile{nav}{\headcommand {\beamer@framepages {47}{47}}} +\@writefile{nav}{\headcommand {\slideentry {5}{3}{2}{48/48}{SQL Client}{0}}} +\@writefile{nav}{\headcommand {\beamer@framepages {48}{48}}} +\@writefile{nav}{\headcommand {\slideentry {5}{3}{3}{49/49}{SQL Client}{0}}} +\@writefile{nav}{\headcommand {\beamer@framepages {49}{49}}} +\@writefile{nav}{\headcommand {\slideentry {5}{3}{4}{50/50}{SQL Client}{0}}} +\@writefile{nav}{\headcommand {\beamer@framepages {50}{50}}} +\@writefile{nav}{\headcommand {\partentry {Anhang}{1}}} +\@writefile{nav}{\headcommand {\beamer@partpages {1}{50}}} +\@writefile{nav}{\headcommand {\beamer@sectionpages {37}{50}}} +\@writefile{nav}{\headcommand {\beamer@subsectionpages {47}{50}}} +\@writefile{nav}{\headcommand {\beamer@appendixpages {51}}} +\@writefile{nav}{\headcommand {\sectionentry {6}{Outro}{51}{Outro}{1}}} +\@writefile{nav}{\headcommand {\beamer@sectionpages {51}{50}}} +\@writefile{nav}{\headcommand {\beamer@subsectionpages {51}{50}}} +\@writefile{nav}{\headcommand {\slideentry {6}{0}{1}{51/51}{}{1}}} +\@writefile{nav}{\headcommand {\beamer@framepages {51}{51}}} +\@writefile{nav}{\headcommand {\beamer@subsectionentry {1}{6}{1}{52}{Fragen}}\headcommand {\beamer@subsectionpages {51}{51}}} +\@writefile{nav}{\headcommand {\slideentry {6}{1}{1}{52/52}{Fragen}{1}}} +\@writefile{nav}{\headcommand {\beamer@framepages {52}{52}}} +\@writefile{nav}{\headcommand {\beamer@subsectionentry {1}{6}{2}{53}{Danke}}\headcommand {\beamer@subsectionpages {52}{52}}} +\@writefile{nav}{\headcommand {\slideentry {6}{2}{1}{53/53}{Danke}{1}}} +\@writefile{nav}{\headcommand {\beamer@framepages {53}{53}}} +\@writefile{toc}{\beamer@sectionintoc {7}{Gems}{54}{1}{5}} +\@writefile{nav}{\headcommand {\sectionentry {7}{Gems}{54}{Gems}{1}}} +\@writefile{nav}{\headcommand {\beamer@sectionpages {51}{53}}} +\@writefile{nav}{\headcommand {\beamer@subsectionpages {53}{53}}} +\@writefile{nav}{\headcommand {\slideentry {7}{0}{1}{54/54}{}{1}}} +\@writefile{nav}{\headcommand {\beamer@framepages {54}{54}}} +\@writefile{toc}{\beamer@subsectionintoc {7}{1}{API - REST in System}{55}{1}{5}} +\@writefile{nav}{\headcommand {\beamer@subsectionentry {1}{7}{1}{55}{API - REST in System}}\headcommand {\beamer@subsectionpages {54}{54}}} +\@writefile{nav}{\headcommand {\slideentry {7}{1}{1}{55/55}{API - REST in System}{1}}} +\@writefile{nav}{\headcommand {\beamer@framepages {55}{55}}} +\@writefile{nav}{\headcommand {\slideentry {7}{1}{2}{56/56}{API - REST in System}{1}}} +\@writefile{nav}{\headcommand {\beamer@framepages {56}{56}}} +\@writefile{toc}{\beamer@subsectionintoc {7}{2}{Quick Query - Sichere SQL Querys}{57}{1}{5}} +\@writefile{nav}{\headcommand {\beamer@subsectionentry {1}{7}{2}{57}{Quick Query - Sichere SQL Querys}}\headcommand {\beamer@subsectionpages {55}{56}}} +\@writefile{nav}{\headcommand {\slideentry {7}{2}{1}{57/57}{Quick Query - Sichere SQL Querys}{1}}} +\@writefile{nav}{\headcommand {\beamer@framepages {57}{57}}} +\@writefile{nav}{\headcommand {\slideentry {7}{2}{2}{58/58}{Quick Query - Sichere SQL Querys}{1}}} +\@writefile{nav}{\headcommand {\beamer@framepages {58}{58}}} +\@writefile{nav}{\headcommand {\beamer@partpages {51}{58}}} +\@writefile{nav}{\headcommand {\beamer@subsectionpages {57}{58}}} +\@writefile{nav}{\headcommand {\beamer@sectionpages {54}{58}}} +\@writefile{nav}{\headcommand {\beamer@documentpages {58}}} +\@writefile{nav}{\headcommand {\def \inserttotalframenumber {58}}} diff --git a/system_php_framework.nav b/system_php_framework.nav index 319c5c9..b80be4e 100644 --- a/system_php_framework.nav +++ b/system_php_framework.nav @@ -87,57 +87,82 @@ \headcommand {\beamer@framepages {31}{31}} \headcommand {\slideentry {4}{1}{3}{32/32}{Was ist Versionskontrolle?}{0}} \headcommand {\beamer@framepages {32}{32}} -\headcommand {\beamer@subsectionentry {0}{4}{2}{33}{Features}}\headcommand {\beamer@subsectionpages {30}{32}} -\headcommand {\slideentry {4}{2}{1}{33/33}{Features}{0}} +\headcommand {\slideentry {4}{1}{4}{33/33}{Was ist Versionskontrolle?}{0}} \headcommand {\beamer@framepages {33}{33}} -\headcommand {\sectionentry {5}{Software Empfehlungen}{34}{Software Empfehlungen}{0}} -\headcommand {\beamer@sectionpages {29}{33}} -\headcommand {\beamer@subsectionpages {33}{33}} -\headcommand {\slideentry {5}{0}{1}{34/34}{}{0}} +\headcommand {\slideentry {4}{1}{5}{34/34}{Was ist Versionskontrolle?}{0}} \headcommand {\beamer@framepages {34}{34}} -\headcommand {\beamer@subsectionentry {0}{5}{1}{35}{Entwicklungsumgebung}}\headcommand {\beamer@subsectionpages {34}{34}} -\headcommand {\slideentry {5}{1}{1}{35/35}{Entwicklungsumgebung}{0}} +\headcommand {\beamer@subsectionentry {0}{4}{2}{35}{Features}}\headcommand {\beamer@subsectionpages {30}{34}} +\headcommand {\slideentry {4}{2}{1}{35/35}{Features}{0}} \headcommand {\beamer@framepages {35}{35}} -\headcommand {\slideentry {5}{1}{2}{36/36}{Entwicklungsumgebung}{0}} +\headcommand {\slideentry {4}{2}{2}{36/36}{Features}{0}} \headcommand {\beamer@framepages {36}{36}} -\headcommand {\beamer@subsectionentry {0}{5}{2}{37}{Versionskontrolle}}\headcommand {\beamer@subsectionpages {35}{36}} -\headcommand {\slideentry {5}{2}{1}{37/37}{Versionskontrolle}{0}} +\headcommand {\sectionentry {5}{Software Empfehlungen}{37}{Software Empfehlungen}{0}} +\headcommand {\beamer@sectionpages {29}{36}} +\headcommand {\beamer@subsectionpages {35}{36}} +\headcommand {\slideentry {5}{0}{1}{37/37}{}{0}} \headcommand {\beamer@framepages {37}{37}} -\headcommand {\beamer@subsectionentry {0}{5}{3}{38}{SQL Client}}\headcommand {\beamer@subsectionpages {37}{37}} -\headcommand {\slideentry {5}{3}{1}{38/38}{SQL Client}{0}} +\headcommand {\beamer@subsectionentry {0}{5}{1}{38}{Versionskontrolle}}\headcommand {\beamer@subsectionpages {37}{37}} +\headcommand {\slideentry {5}{1}{1}{38/38}{Versionskontrolle}{0}} \headcommand {\beamer@framepages {38}{38}} -\headcommand {\partentry {Anhang}{1}} -\headcommand {\beamer@partpages {1}{38}} -\headcommand {\beamer@sectionpages {34}{38}} -\headcommand {\beamer@subsectionpages {38}{38}} -\headcommand {\beamer@appendixpages {39}} -\headcommand {\sectionentry {6}{Outro}{39}{Outro}{1}} -\headcommand {\beamer@sectionpages {39}{38}} -\headcommand {\beamer@subsectionpages {39}{38}} -\headcommand {\slideentry {6}{0}{1}{39/39}{}{1}} +\headcommand {\slideentry {5}{1}{2}{39/39}{Versionskontrolle}{0}} \headcommand {\beamer@framepages {39}{39}} -\headcommand {\beamer@subsectionentry {1}{6}{1}{40}{Fragen}}\headcommand {\beamer@subsectionpages {39}{39}} -\headcommand {\slideentry {6}{1}{1}{40/40}{Fragen}{1}} +\headcommand {\slideentry {5}{1}{3}{40/40}{Versionskontrolle}{0}} \headcommand {\beamer@framepages {40}{40}} -\headcommand {\beamer@subsectionentry {1}{6}{2}{41}{Danke}}\headcommand {\beamer@subsectionpages {40}{40}} -\headcommand {\slideentry {6}{2}{1}{41/41}{Danke}{1}} +\headcommand {\slideentry {5}{1}{4}{41/41}{Versionskontrolle}{0}} \headcommand {\beamer@framepages {41}{41}} -\headcommand {\sectionentry {7}{Gems}{42}{Gems}{1}} -\headcommand {\beamer@sectionpages {39}{41}} -\headcommand {\beamer@subsectionpages {41}{41}} -\headcommand {\slideentry {7}{0}{1}{42/42}{}{1}} +\headcommand {\beamer@subsectionentry {0}{5}{2}{42}{Entwicklungsumgebung}}\headcommand {\beamer@subsectionpages {38}{41}} +\headcommand {\slideentry {5}{2}{1}{42/42}{Entwicklungsumgebung}{0}} \headcommand {\beamer@framepages {42}{42}} -\headcommand {\beamer@subsectionentry {1}{7}{1}{43}{API - REST in System}}\headcommand {\beamer@subsectionpages {42}{42}} -\headcommand {\slideentry {7}{1}{1}{43/43}{API - REST in System}{1}} +\headcommand {\slideentry {5}{2}{2}{43/43}{Entwicklungsumgebung}{0}} \headcommand {\beamer@framepages {43}{43}} -\headcommand {\beamer@subsectionentry {1}{7}{2}{44}{Quick Query - Sichere SQL Querys}}\headcommand {\beamer@subsectionpages {43}{43}} -\headcommand {\slideentry {7}{2}{1}{44/44}{Quick Query - Sichere SQL Querys}{1}} +\headcommand {\slideentry {5}{2}{3}{44/44}{Entwicklungsumgebung}{0}} \headcommand {\beamer@framepages {44}{44}} -\headcommand {\beamer@subsectionentry {1}{7}{3}{45}{Kapselung in System - Eine Seite}}\headcommand {\beamer@subsectionpages {44}{44}} -\headcommand {\slideentry {7}{3}{1}{45/45}{Kapselung in System - Eine Seite}{1}} +\headcommand {\slideentry {5}{2}{4}{45/45}{Entwicklungsumgebung}{0}} \headcommand {\beamer@framepages {45}{45}} -\headcommand {\beamer@partpages {39}{45}} -\headcommand {\beamer@subsectionpages {45}{45}} -\headcommand {\beamer@sectionpages {42}{45}} -\headcommand {\beamer@documentpages {45}} -\headcommand {\def \inserttotalframenumber {45}} +\headcommand {\slideentry {5}{2}{5}{46/46}{Entwicklungsumgebung}{0}} +\headcommand {\beamer@framepages {46}{46}} +\headcommand {\beamer@subsectionentry {0}{5}{3}{47}{SQL Client}}\headcommand {\beamer@subsectionpages {42}{46}} +\headcommand {\slideentry {5}{3}{1}{47/47}{SQL Client}{0}} +\headcommand {\beamer@framepages {47}{47}} +\headcommand {\slideentry {5}{3}{2}{48/48}{SQL Client}{0}} +\headcommand {\beamer@framepages {48}{48}} +\headcommand {\slideentry {5}{3}{3}{49/49}{SQL Client}{0}} +\headcommand {\beamer@framepages {49}{49}} +\headcommand {\slideentry {5}{3}{4}{50/50}{SQL Client}{0}} +\headcommand {\beamer@framepages {50}{50}} +\headcommand {\partentry {Anhang}{1}} +\headcommand {\beamer@partpages {1}{50}} +\headcommand {\beamer@sectionpages {37}{50}} +\headcommand {\beamer@subsectionpages {47}{50}} +\headcommand {\beamer@appendixpages {51}} +\headcommand {\sectionentry {6}{Outro}{51}{Outro}{1}} +\headcommand {\beamer@sectionpages {51}{50}} +\headcommand {\beamer@subsectionpages {51}{50}} +\headcommand {\slideentry {6}{0}{1}{51/51}{}{1}} +\headcommand {\beamer@framepages {51}{51}} +\headcommand {\beamer@subsectionentry {1}{6}{1}{52}{Fragen}}\headcommand {\beamer@subsectionpages {51}{51}} +\headcommand {\slideentry {6}{1}{1}{52/52}{Fragen}{1}} +\headcommand {\beamer@framepages {52}{52}} +\headcommand {\beamer@subsectionentry {1}{6}{2}{53}{Danke}}\headcommand {\beamer@subsectionpages {52}{52}} +\headcommand {\slideentry {6}{2}{1}{53/53}{Danke}{1}} +\headcommand {\beamer@framepages {53}{53}} +\headcommand {\sectionentry {7}{Gems}{54}{Gems}{1}} +\headcommand {\beamer@sectionpages {51}{53}} +\headcommand {\beamer@subsectionpages {53}{53}} +\headcommand {\slideentry {7}{0}{1}{54/54}{}{1}} +\headcommand {\beamer@framepages {54}{54}} +\headcommand {\beamer@subsectionentry {1}{7}{1}{55}{API - REST in System}}\headcommand {\beamer@subsectionpages {54}{54}} +\headcommand {\slideentry {7}{1}{1}{55/55}{API - REST in System}{1}} +\headcommand {\beamer@framepages {55}{55}} +\headcommand {\slideentry {7}{1}{2}{56/56}{API - REST in System}{1}} +\headcommand {\beamer@framepages {56}{56}} +\headcommand {\beamer@subsectionentry {1}{7}{2}{57}{Quick Query - Sichere SQL Querys}}\headcommand {\beamer@subsectionpages {55}{56}} +\headcommand {\slideentry {7}{2}{1}{57/57}{Quick Query - Sichere SQL Querys}{1}} +\headcommand {\beamer@framepages {57}{57}} +\headcommand {\slideentry {7}{2}{2}{58/58}{Quick Query - Sichere SQL Querys}{1}} +\headcommand {\beamer@framepages {58}{58}} +\headcommand {\beamer@partpages {51}{58}} +\headcommand {\beamer@subsectionpages {57}{58}} +\headcommand {\beamer@sectionpages {54}{58}} +\headcommand {\beamer@documentpages {58}} +\headcommand {\def \inserttotalframenumber {58}} diff --git a/system_php_framework.out b/system_php_framework.out index 1e2d702..60d6aba 100644 --- a/system_php_framework.out +++ b/system_php_framework.out @@ -7,6 +7,5 @@ \BOOKMARK [2][]{Outline0.4}{Versionskontrolle}{}% 7 \BOOKMARK [2][]{Outline0.5}{Software Empfehlungen}{}% 8 \BOOKMARK [2][]{Outline1.7}{Gems}{}% 9 -\BOOKMARK [3][]{Outline1.7.1.43}{API - REST in System}{Outline1.7}% 10 -\BOOKMARK [3][]{Outline1.7.2.44}{Quick Query - Sichere SQL Querys}{Outline1.7}% 11 -\BOOKMARK [3][]{Outline1.7.3.45}{Kapselung in System - Eine Seite}{Outline1.7}% 12 +\BOOKMARK [3][]{Outline1.7.1.55}{API - REST in System}{Outline1.7}% 10 +\BOOKMARK [3][]{Outline1.7.2.57}{Quick Query - Sichere SQL Querys}{Outline1.7}% 11 diff --git a/system_php_framework.pdf b/system_php_framework.pdf index 3279690..26cfb93 100644 Binary files a/system_php_framework.pdf and b/system_php_framework.pdf differ diff --git a/system_php_framework.synctex.gz b/system_php_framework.synctex.gz index 48be04b..70a5781 100644 Binary files a/system_php_framework.synctex.gz and b/system_php_framework.synctex.gz differ diff --git a/system_php_framework.tex b/system_php_framework.tex index 5c5cd33..d2c94c3 100644 --- a/system_php_framework.tex +++ b/system_php_framework.tex @@ -19,6 +19,8 @@ \usepackage{pgf} \usepackage{multimedia} \usepackage{color} +%\usepackage{listings} +\usepackage{hyperref} % beamer: How to place images behind text (z-order) % (http://tex.stackexchange.com/a/134311) diff --git a/system_php_framework.toc b/system_php_framework.toc index f238fdf..0e00c29 100644 --- a/system_php_framework.toc +++ b/system_php_framework.toc @@ -6,8 +6,7 @@ \beamer@subsectionintoc {3}{3}{Vorteile und Nachteile}{26}{0}{2} \beamer@subsectionintoc {3}{4}{Ausblick}{27}{0}{2} \beamer@sectionintoc {4}{Versionskontrolle}{29}{0}{3} -\beamer@sectionintoc {5}{Software Empfehlungen}{34}{0}{4} -\beamer@sectionintoc {7}{Gems}{42}{1}{5} -\beamer@subsectionintoc {7}{1}{API - REST in System}{43}{1}{5} -\beamer@subsectionintoc {7}{2}{Quick Query - Sichere SQL Querys}{44}{1}{5} -\beamer@subsectionintoc {7}{3}{Kapselung in System - Eine Seite}{45}{1}{5} +\beamer@sectionintoc {5}{Software Empfehlungen}{37}{0}{4} +\beamer@sectionintoc {7}{Gems}{54}{1}{5} +\beamer@subsectionintoc {7}{1}{API - REST in System}{55}{1}{5} +\beamer@subsectionintoc {7}{2}{Quick Query - Sichere SQL Querys}{57}{1}{5} diff --git a/tex/3.section.system.tex b/tex/3.section.system.tex index 2ac7849..c0434a7 100644 --- a/tex/3.section.system.tex +++ b/tex/3.section.system.tex @@ -152,22 +152,22 @@ \item{Git} \end{itemize} \end{block} + %\begin{backgroundblock}{1.0cm}{6.5cm} + % \includegraphics[width=1.5cm]{img/hashbangs.png} + %\end{backgroundblock} \begin{backgroundblock}{1.0cm}{6.5cm} - \includegraphics[width=1.5cm]{img/hashbangs.png} - \end{backgroundblock} - \begin{backgroundblock}{3.0cm}{6.5cm} \includegraphics[width=1.5cm]{img/jQurery.jpg} \end{backgroundblock} - \begin{backgroundblock}{5.0cm}{6.8cm} + \begin{backgroundblock}{3.0cm}{6.8cm} \includegraphics[width=1.5cm]{img/bootstrap-logo.png} \end{backgroundblock} - \begin{backgroundblock}{7.0cm}{6.5cm} + \begin{backgroundblock}{5.0cm}{6.5cm} \includegraphics[width=1.5cm]{img/sass.jpg} \end{backgroundblock} - \begin{backgroundblock}{9.0cm}{6.5cm} + \begin{backgroundblock}{7.0cm}{6.5cm} \includegraphics[width=1.5cm]{img/minify.png} \end{backgroundblock} - \begin{backgroundblock}{11cm}{7.0cm} + \begin{backgroundblock}{9.0cm}{7.0cm} \includegraphics[width=1.5cm]{img/git.png} \end{backgroundblock} } @@ -248,6 +248,7 @@ \item{Kompakt und Einfach} \item{Noch jung, keine starren Strukturen} \item{Git kompatibel} + \item{frei (\url{https://github.com/webcraftmedia/system})} \end{itemize} \end{block} \begin{block}{Nachteile bei Einsatz von System} diff --git a/tex/4.section.git.tex b/tex/4.section.git.tex index 6b62193..681921d 100644 --- a/tex/4.section.git.tex +++ b/tex/4.section.git.tex @@ -10,7 +10,21 @@ \subsection*{Was ist Versionskontrolle?} \frame{ \frametitle{Was Ist Versionskontrolle?} - Erkläre das Prinzip mit Bildern + \begin{backgroundblock}{4.5cm}{2.5cm} + \includegraphics[width=3.5cm]{img/git_stapel.jpg} + \end{backgroundblock} +} +\frame{ + \frametitle{Git Branch} + \begin{backgroundblock}{1cm}{2.5cm} + \includegraphics[width=10cm]{img/git_branch.png} + \end{backgroundblock} +} +\frame{ + \frametitle{Git Workflow} + \begin{backgroundblock}{1cm}{2.5cm} + \includegraphics[width=10cm]{img/git_workflow.png} + \end{backgroundblock} } \frame{ \frametitle{Welche Versionskontrollsystem gibt es?} @@ -45,6 +59,13 @@ \item{Motivation} \item{Deploy} \item{Mehrere Entwickler können an dem selben Projekt arbeiten} + \item{Backup inklusive Historie} \end{itemize} \end{block} +} +\frame{ + \frametitle{Projektverlauf visualisiert über Git} + \begin{backgroundblock}{0.5cm}{2.5cm} + \includegraphics[width=12cm]{img/github_system.png} + \end{backgroundblock} } \ No newline at end of file diff --git a/tex/5.section.software.tex b/tex/5.section.software.tex index 7da5a8b..c6682ef 100644 --- a/tex/5.section.software.tex +++ b/tex/5.section.software.tex @@ -5,7 +5,40 @@ \huge{Software Empfehlungen - Entwicklung} \end{center} \end{block} -} +} + +\subsection*{Versionskontrolle} +\frame{ + \frametitle{Versionskontrollsoftware für GIT} + \begin{block}{} + \begin{itemize} + \item{Git Console} + \item{Tortoise Git} + \item{Smart Git (commercial)} + \end{itemize} + \end{block} +} + +\frame[t]{ + \frametitle{Git Console} + \begin{backgroundblock}{2cm}{2.5cm} + \includegraphics[width=8cm]{img/git_console.png} + \end{backgroundblock} +} + +\frame[t]{ + \frametitle{Tortoise Git} + \begin{backgroundblock}{2.25cm}{2.5cm} + \includegraphics[width=7.5cm]{img/git_tortoisegit.png} + \end{backgroundblock} +} + +\frame[t]{ + \frametitle{Smart Git} + \begin{backgroundblock}{2cm}{2.5cm} + \includegraphics[width=8.5cm]{img/git_smartgit.png} + \end{backgroundblock} +} \subsection*{Entwicklungsumgebung} \frame{ @@ -24,21 +57,29 @@ \begin{itemize} \item{Netbeans} \item{Eclipse} - \item{PHPStorm (commercial)} + \item{PhpStorm (commercial)} \end{itemize} \end{block} } +\frame[t]{ + \frametitle{Netbeans} + \begin{backgroundblock}{1.5cm}{2.5cm} + \includegraphics[width=9.5cm]{img/nb.png} + \end{backgroundblock} +} -\subsection*{Versionskontrolle} -\frame{ - \frametitle{Versionskontrollsoftware für GIT} - \begin{block}{} - \begin{itemize} - \item{Git Console} - \item{Tortoise GIT} - \item{Smart GIT (commercial)} - \end{itemize} - \end{block} +\frame[t]{ + \frametitle{Eclipse} + \begin{backgroundblock}{2.5cm}{2.5cm} + \includegraphics[width=7cm]{img/eclipse.png} + \end{backgroundblock} +} + +\frame[t]{ + \frametitle{PhpStorm} + \begin{backgroundblock}{1.75cm}{2.5cm} + \includegraphics[width=9cm]{img/phpstorm.png} + \end{backgroundblock} } \subsection*{SQL Client} @@ -47,8 +88,28 @@ \begin{block}{} \begin{itemize} \item{Heidi SQL} - \item{PhpMyAdmin} + \item{phpMyAdmin} \item{Navicat (commercial)} \end{itemize} \end{block} +} +\frame[t]{ + \frametitle{Heidi SQL} + \begin{backgroundblock}{1.75cm}{2.5cm} + \includegraphics[width=9cm]{img/heidisql.png} + \end{backgroundblock} +} + +\frame[t]{ + \frametitle{phpMyAdmin} + \begin{backgroundblock}{1.75cm}{2.5cm} + \includegraphics[width=9cm]{img/phpmyadmin.jpg} + \end{backgroundblock} +} + +\frame[t]{ + \frametitle{Navicat} + \begin{backgroundblock}{2cm}{2.5cm} + \includegraphics[width=8cm]{img/navicat.png} + \end{backgroundblock} } \ No newline at end of file diff --git a/tex/6.section.outro.tex b/tex/6.section.outro.tex index 44954b4..eb5c9a7 100644 --- a/tex/6.section.outro.tex +++ b/tex/6.section.outro.tex @@ -25,7 +25,6 @@ \begin{itemize} \item{API - REST in System} \item{Quick Query - Sichere SQL Querys} - \item{Kapselung in System - Eine Seite} \end{itemize} \end{block} } \ No newline at end of file diff --git a/tex/7.section.system.gems.tex b/tex/7.section.system.gems.tex index f1df7c6..977ab2a 100644 --- a/tex/7.section.system.gems.tex +++ b/tex/7.section.system.gems.tex @@ -10,14 +10,46 @@ \subsection{API - REST in System} \frame{ \frametitle{API - REST in System} + \begin{block}{URL} + \url{http://www.example.com/?page=start} + \end{block} + \begin{block}{Regeln} + \includegraphics[width=9cm]{img/sql_system_api.png} + \end{block} + \begin{block}{Funktion} + public static function page\_start() + \end{block} +} +\frame[t]{ + \frametitle{API Class Beispiel} + \begin{backgroundblock}{1cm}{2.5cm} + \includegraphics[width=10cm]{img/api_dasense.png} + \end{backgroundblock} } \subsection{Quick Query - Sichere SQL Querys} \frame{ \frametitle{Quick Query - Sichere SQL Querys} + \begin{block}{QQ} + \includegraphics[width=8cm]{img/qq.png} + \end{block} + \begin{block}{QP} + \includegraphics[width=8cm]{img/qp.png} + \end{block} } - -\subsection{Kapselung in System - Eine Seite} + \frame{ - \frametitle{Kapselung in System - Eine Seite} + \frametitle{Quick Query - Sichere SQL Querys} + \begin{block}{Q1 - Eine Zeile} + \$res = SYS\_SAIMOD\_API\_SELECT::Q1(array(\$ID,\$group)); + \end{block} + \begin{block}{QA - Alle Zeilen} + \$res = SYS\_SAIMOD\_API\_SELECT::QA(array(\$ID,\$group)); + \end{block} + \begin{block}{QQ - Selber Interrieren} + \$res = SYS\_SAIMOD\_API\_SELECT::QQ(array(\$ID,\$group)); + \end{block} + \begin{block}{QI - Einfügen/Löschen} + \$res = SYS\_SAIMOD\_API\_SELECT::QI(array(\$ID,\$group)); + \end{block} } \ No newline at end of file