diff --git a/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj b/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj index 3e33b707..e772421b 100644 --- a/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj +++ b/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj @@ -35,7 +35,7 @@ prompt 4 True - None + Full False False False @@ -76,6 +76,10 @@ ..\..\packages\Xamarin.Forms.2.3.0.107\lib\MonoAndroid10\FormsViewGroup.dll True + + ..\..\packages\MarkdownDeep-av.NET.1.5.2\lib\MonoAndroid10\MarkdownDeep.dll + True + ..\..\packages\Xam.Plugin.Media.1.0.1\lib\MonoAndroid10\Media.Plugin.dll True @@ -100,10 +104,12 @@ + + False + ..\..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5.1\System.Drawing.dll + - - ..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Animated.Vector.Drawable.dll True @@ -264,7 +270,7 @@ - + diff --git a/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj.user b/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj.user index f4289f65..84b624c1 100644 --- a/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj.user +++ b/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj.user @@ -3,4 +3,7 @@ Nexus 4 + + C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\MonoAndroid\v6.0\ + \ No newline at end of file diff --git a/BookAStar/BookAStar.Droid/MainActivity.cs b/BookAStar/BookAStar.Droid/MainActivity.cs index cf78b0b6..baca502a 100644 --- a/BookAStar/BookAStar.Droid/MainActivity.cs +++ b/BookAStar/BookAStar.Droid/MainActivity.cs @@ -22,6 +22,7 @@ using BookAStar.Model.Auth.Account; using BookAStar.Droid.OAuth; using Yavsc.Helpers; using Yavsc.Models.Identity; +using static Android.Content.Res.Resources; namespace BookAStar.Droid { @@ -37,8 +38,11 @@ namespace BookAStar.Droid global::Xamarin.Forms.Forms.Init(this, bundle); global::Xamarin.FormsMaps.Init(this, bundle); LoadApplication(new App(this)); + /* var x = typeof(Themes.DarkThemeResources); + x = typeof(Themes.LightThemeResources); + x = typeof(Themes.Android.UnderlineEffect); */ } - + public bool EnablePushNotifications(bool enable) { diff --git a/BookAStar/BookAStar.Droid/Properties/AndroidManifest.xml b/BookAStar/BookAStar.Droid/Properties/AndroidManifest.xml index 659bb9cf..5bc18bd0 100644 --- a/BookAStar/BookAStar.Droid/Properties/AndroidManifest.xml +++ b/BookAStar/BookAStar.Droid/Properties/AndroidManifest.xml @@ -31,12 +31,12 @@ - + - + \ No newline at end of file diff --git a/BookAStar/BookAStar.Droid/Services/GcmRegistrationIntentService.cs b/BookAStar/BookAStar.Droid/Services/GcmRegistrationIntentService.cs index 9ede457f..2909499f 100644 --- a/BookAStar/BookAStar.Droid/Services/GcmRegistrationIntentService.cs +++ b/BookAStar/BookAStar.Droid/Services/GcmRegistrationIntentService.cs @@ -48,10 +48,13 @@ namespace BookAStar.Droid var instanceID = InstanceID.GetInstance(this); #if DEBUG + // When debugging, and application data/cache is preserved, + // a previous instance comes from another application installation + // and the old registration against GCM fails, + // until one delete it. try { instanceID.DeleteInstanceID(); - } catch(Exception ex) { @@ -97,7 +100,11 @@ namespace BookAStar.Droid { var pubSub = GcmPubSub.GetInstance(this); pubSub.Subscribe(token, "/topics/global", null); - pubSub.Subscribe (token, "/topics/jobs", null); + + // TODO if a Activity is specified, + // and general annonces in this activity are accepted: + // + // pubSub.Subscribe(token, "/topics/jobs/"+ActivityCode, null); } } diff --git a/BookAStar/BookAStar.Droid/packages.config b/BookAStar/BookAStar.Droid/packages.config index 451c6e77..3c8a0a89 100644 --- a/BookAStar/BookAStar.Droid/packages.config +++ b/BookAStar/BookAStar.Droid/packages.config @@ -1,5 +1,6 @@  + diff --git a/BookAStar/BookAStar/App.xaml.cs b/BookAStar/BookAStar/App.xaml.cs index adb41003..5f294941 100644 --- a/BookAStar/BookAStar/App.xaml.cs +++ b/BookAStar/BookAStar/App.xaml.cs @@ -83,7 +83,7 @@ namespace BookAStar else deviceInfoPage.Focus(); } - public async Task PostDeviceInfo() + public void PostDeviceInfo() { var res = PlateformSpecificInstance.InvokeApi( "gcm/register", diff --git a/BookAStar/BookAStar/Helpers/MainSettings.cs b/BookAStar/BookAStar/Helpers/MainSettings.cs index 5b69b109..ab1e0acf 100644 --- a/BookAStar/BookAStar/Helpers/MainSettings.cs +++ b/BookAStar/BookAStar/Helpers/MainSettings.cs @@ -78,9 +78,7 @@ namespace BookAStar // Inform the server of it. if (oldregid != value) { - Task.Run( async () => { - await App.CurrentApp.PostDeviceInfo(); - }); + App.CurrentApp.PostDeviceInfo(); } } get { return AppSettings.GetValueOrDefault(GoogleRegIdKey); } @@ -109,8 +107,7 @@ namespace BookAStar return accountList; } } - - private static User currentUser = null; + public static User CurrentUser { get { var uname = UserName; @@ -121,8 +118,7 @@ namespace BookAStar } set { - var olduserid = currentUser?.Id; - currentUser = value; + var olduserid = CurrentUser?.Id; AppSettings.AddOrUpdateValue(userNameKey, value?.UserName); // TODO if it changes, for a valid // ident, and we've got a GoogleRedId, inform the server @@ -131,11 +127,10 @@ namespace BookAStar { if (olduserid != value.Id) { - Task.Run(async () => { - await App.CurrentApp.PostDeviceInfo(); - }); + App.CurrentApp.PostDeviceInfo(); } } + // TODO else Unregister the device } } diff --git a/BookAStar/BookAStar/SettingsPage.xaml b/BookAStar/BookAStar/SettingsPage.xaml index cefc2a6d..e0984276 100644 --- a/BookAStar/BookAStar/SettingsPage.xaml +++ b/BookAStar/BookAStar/SettingsPage.xaml @@ -1,20 +1,18 @@  +Title="Paramètres Booking star" +BindingContext="." > - + - diff --git a/BookAStar/BookAStar/SettingsPage.xaml.cs b/BookAStar/BookAStar/SettingsPage.xaml.cs index a432fbc5..5ffaa059 100644 --- a/BookAStar/BookAStar/SettingsPage.xaml.cs +++ b/BookAStar/BookAStar/SettingsPage.xaml.cs @@ -24,6 +24,7 @@ namespace BookAStar this.Musical = MainSettings.Musical; this.Environ = MainSettings.Environ; + this.BindingContext = this; AddAccountBtn.Clicked += AddAccountBtn_Clicked; diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..21fc049f --- /dev/null +++ b/LICENSE @@ -0,0 +1,231 @@ +GNU GENERAL PUBLIC LICENSE +Version 3, 29 June 2007 +Copyright © 2007 Free Software Foundation, Inc. + +Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + +Preamble + +The GNU General Public License is a free, copyleft license for software and other kinds of works. + +The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. + +To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. + +For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. + +Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. + +For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. + +Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. + +Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. + +The precise terms and conditions for copying, distribution and modification follow. + +TERMS AND CONDITIONS + +0. Definitions. + +“This License” refers to version 3 of the GNU General Public License. + +“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. + +“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations. + +To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work. + +A “covered work” means either the unmodified Program or a work based on the Program. + +To “propagate” a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. + +To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. + +An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. + +1. Source Code. +The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work. + +A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. + +The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. + +The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. + +The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. + +The Corresponding Source for a work in source code form is that same work. + +2. Basic Permissions. +All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. + +You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. + +Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. + +3. Protecting Users' Legal Rights From Anti-Circumvention Law. +No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. + +When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. + +4. Conveying Verbatim Copies. +You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. + +You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. + +5. Conveying Modified Source Versions. +You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: + +a) The work must carry prominent notices stating that you modified it, and giving a relevant date. + +b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”. + +c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. + +d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. + +A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. + +6. Conveying Non-Source Forms. +You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: + +a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. + +b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. + +c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. + +d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. + +e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. + +A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. + +A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. + +“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. + +If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). + +The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. + +Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. + +7. Additional Terms. +“Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. + +When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. + +Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: + +a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or + +b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or + +c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or + +d) Limiting the use for publicity purposes of names of licensors or authors of the material; or + +e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or + +f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. + +All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. + +If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. + +Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. + +8. Termination. +You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). + +However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. + +Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. + +Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. + +9. Acceptance Not Required for Having Copies. +You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. + +10. Automatic Licensing of Downstream Recipients. +Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. + +An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. + +You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. + +11. Patents. +A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”. + +A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. + +Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. + +In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. + +If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. + +If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. + +A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. + +Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. + +12. No Surrender of Others' Freedom. +If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. + +13. Use with the GNU Affero General Public License. +Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. + +14. Revised Versions of this License. +The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. + +If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. + +Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. + +15. Disclaimer of Warranty. +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +16. Limitation of Liability. +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +17. Interpretation of Sections 15 and 16. +If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. + +END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the “copyright” line and a pointer to where the full notice is found. + + +Copyright (C) + +This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + +If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: + + Copyright (C) +This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. +This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an “about box”. + +You should also get your employer (if you work as a programmer) or school, if any, to sign a “copyright disclaimer” for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see . + +The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read . \ No newline at end of file diff --git a/Yavsc.Api/Helpers/SimpleJsonPostMethod.cs b/Yavsc.Api/Helpers/SimpleJsonPostMethod.cs index 01e7b3b8..bb1ba918 100644 --- a/Yavsc.Api/Helpers/SimpleJsonPostMethod.cs +++ b/Yavsc.Api/Helpers/SimpleJsonPostMethod.cs @@ -20,10 +20,10 @@ // along with this program. If not, see . using System.Net; using System.IO; -using System.Json; using System.Threading.Tasks; using Newtonsoft.Json; using System; +using System.Json; namespace Yavsc.Helpers { @@ -32,7 +32,7 @@ namespace Yavsc.Helpers /// public class SimpleJsonPostMethod : IDisposable { - private HttpWebRequest request=null; + private HttpWebRequest request=null; /// /// Initializes a new instance of the Yavsc.Helpers.SimpleJsonPostMethod class. @@ -80,8 +80,7 @@ namespace Yavsc.Helpers public async Task InvokeJson(object query) { - - JsonValue jsonDoc=null; + JsonValue jsonDoc=null; using (Stream streamQuery = request.GetRequestStream()) { using (StreamWriter writer = new StreamWriter(streamQuery)) { writer.Write (JsonConvert.SerializeObject(query)); diff --git a/Yavsc.Api/Model/Market/Service.cs b/Yavsc.Api/Model/Market/Service.cs deleted file mode 100644 index ba5a09aa..00000000 --- a/Yavsc.Api/Model/Market/Service.cs +++ /dev/null @@ -1,26 +0,0 @@ - -namespace Yavsc.Models.Market { - using System.ComponentModel.DataAnnotations.Schema; - - public enum BillingMode {  - Unitary, - SetPrice, - ByExecutionTime - } -public partial class Service : BaseProduct - { - public string ContextId { get; set; } - [ForeignKey("ContextId")] - public virtual Activity Context { get; set; } - - public BillingMode? Billing { get; set; } - // TODO public ServiceSpecification Specification { get; set; } - /// - /// In euro, either by hour or by release - /// - /// - public decimal? Pricing { get; set; } - - } - -} \ No newline at end of file diff --git a/Yavsc.Api/project.json b/Yavsc.Api/project.json index a67e5131..8af86670 100644 --- a/Yavsc.Api/project.json +++ b/Yavsc.Api/project.json @@ -24,8 +24,7 @@ "frameworks": { "net451": { "dependencies": { - "Yavsc.Client": "1.0.0-*" } } } -} \ No newline at end of file +} diff --git a/Yavsc.Api/project.lock.json b/Yavsc.Api/project.lock.json index f3013ca9..03c1b066 100644 --- a/Yavsc.Api/project.lock.json +++ b/Yavsc.Api/project.lock.json @@ -120,18 +120,6 @@ "lib/net45/System.Interactive.Async.dll": {} } }, - "Json.NET.Web/1.0.49": { - "type": "package", - "dependencies": { - "Newtonsoft.Json": "8.0.3" - }, - "compile": { - "lib/portable45-net45+win8+wpa81/Json.NET.Web.dll": {} - }, - "runtime": { - "lib/portable45-net45+win8+wpa81/Json.NET.Web.dll": {} - } - }, "Microsoft.AspNet.Authentication/1.0.0-rc1-final": { "type": "package", "dependencies": { @@ -763,14 +751,6 @@ "runtime": { "lib/net45/_._": {} } - }, - "Yavsc.Client/1.0.0": { - "type": "project", - "framework": ".NETPortable,Version=v4.5,Profile=Profile111", - "dependencies": { - "Json.NET.Web": "1.0.49", - "Newtonsoft.Json": "9.0.1" - } } }, ".NETFramework,Version=v4.5.1/win7-x86": { @@ -891,18 +871,6 @@ "lib/net45/System.Interactive.Async.dll": {} } }, - "Json.NET.Web/1.0.49": { - "type": "package", - "dependencies": { - "Newtonsoft.Json": "8.0.3" - }, - "compile": { - "lib/portable45-net45+win8+wpa81/Json.NET.Web.dll": {} - }, - "runtime": { - "lib/portable45-net45+win8+wpa81/Json.NET.Web.dll": {} - } - }, "Microsoft.AspNet.Authentication/1.0.0-rc1-final": { "type": "package", "dependencies": { @@ -1534,14 +1502,6 @@ "runtime": { "lib/net45/_._": {} } - }, - "Yavsc.Client/1.0.0": { - "type": "project", - "framework": ".NETPortable,Version=v4.5,Profile=Profile111", - "dependencies": { - "Json.NET.Web": "1.0.49", - "Newtonsoft.Json": "9.0.1" - } } }, ".NETFramework,Version=v4.5.1/win7-x64": { @@ -1662,18 +1622,6 @@ "lib/net45/System.Interactive.Async.dll": {} } }, - "Json.NET.Web/1.0.49": { - "type": "package", - "dependencies": { - "Newtonsoft.Json": "8.0.3" - }, - "compile": { - "lib/portable45-net45+win8+wpa81/Json.NET.Web.dll": {} - }, - "runtime": { - "lib/portable45-net45+win8+wpa81/Json.NET.Web.dll": {} - } - }, "Microsoft.AspNet.Authentication/1.0.0-rc1-final": { "type": "package", "dependencies": { @@ -2305,22 +2253,10 @@ "runtime": { "lib/net45/_._": {} } - }, - "Yavsc.Client/1.0.0": { - "type": "project", - "framework": ".NETPortable,Version=v4.5,Profile=Profile111", - "dependencies": { - "Json.NET.Web": "1.0.49", - "Newtonsoft.Json": "9.0.1" - } } } }, "libraries": { - "Yavsc.Client/1.0.0": { - "type": "project", - "path": "../wrap/Yavsc.Client/project.json" - }, "EntityFramework.Commands/7.0.0-rc1-final": { "type": "package", "serviceable": true, @@ -2431,16 +2367,6 @@ "lib/portable-windows8+net45+wp8/System.Interactive.Async.XML" ] }, - "Json.NET.Web/1.0.49": { - "type": "package", - "sha512": "1lhQBN6Oi5IEf2BIhBgqWH3r9uBUitvsoQi0QlC+8IkFYyHq+076OorXbcTxmcXgSsmc66LyoUpqG62BnLOWgg==", - "files": [ - "Json.NET.Web.1.0.49.nupkg", - "Json.NET.Web.1.0.49.nupkg.sha512", - "Json.NET.Web.nuspec", - "lib/portable45-net45+win8+wpa81/Json.NET.Web.dll" - ] - }, "Microsoft.AspNet.Authentication/1.0.0-rc1-final": { "type": "package", "serviceable": true, @@ -3115,8 +3041,6 @@ "Newtonsoft.Json >= 9.0.1", "System.Json >= 4.0.20126.16343" ], - ".NETFramework,Version=v4.5.1": [ - "Yavsc.Client >= 1.0.0-*" - ] + ".NETFramework,Version=v4.5.1": [] } -} \ No newline at end of file +} diff --git a/Yavsc.Client/Helpers/SimpleJsonPostMethod.cs b/Yavsc.Client/Helpers/SimpleJsonPostMethod.cs deleted file mode 100644 index 0917d6f4..00000000 --- a/Yavsc.Client/Helpers/SimpleJsonPostMethod.cs +++ /dev/null @@ -1,128 +0,0 @@ -// -// PostJson.cs -// -// Author: -// Paul Schneider -// -// Copyright (c) 2015 Paul Schneider -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public License -// along with this program. If not, see . -using System.Net; -using System.IO; -using System.Threading.Tasks; -using Newtonsoft.Json; -using System; -using System.Diagnostics; - -namespace Yavsc.Helpers -{ - /// - /// Simple json post method. - /// - public class NotSoSimpleJsonPostMethod : IDisposable - { - private HttpWebRequest request = null; - - /// - /// Initializes a new instance of the Yavsc.Helpers.SimpleJsonPostMethod class. - /// - /// Path to method. - public NotSoSimpleJsonPostMethod(string pathToMethod, string authorizationHeader = null) - { - request = (HttpWebRequest)WebRequest.Create(pathToMethod); - request.Method = "POST"; - request.Accept = "application/json"; - request.ContentType = "application/json"; - // request.SendChunked = true; - // request.TransferEncoding = "UTF-8"; - request.Headers = new WebHeaderCollection(); - if (authorizationHeader != null) - request.Headers["Authorization"] = "Bearer " + authorizationHeader; - - } - - public void Dispose() - { - request.Abort(); - } - - /// - /// Invoke the specified query. - /// - /// Query. - public async Task Invoke(object query) - { - - using (Stream streamQuery = await request.GetRequestStreamAsync()) - { - using (StreamWriter writer = new StreamWriter(streamQuery)) - { - writer.Write(JsonConvert.SerializeObject(query)); - } - } - TAnswer ans = default(TAnswer); - using (WebResponse response = await request.GetResponseAsync()) - { - using (Stream responseStream = response.GetResponseStream()) - { - using (StreamReader rdr = new StreamReader(responseStream)) - { - ans = (TAnswer)JsonConvert.DeserializeObject(rdr.ReadToEnd()); - } - } - } - return ans; - } - - public async Task InvokeAnonymous(object query) - { - object result = null; - using (Stream streamQuery = await request.GetRequestStreamAsync()) - { - using (StreamWriter writer = new StreamWriter(streamQuery)) - { - var json = JsonConvert.SerializeObject(query); - - writer.Write(json); - - } - } - try - { - using (WebResponse response = await request.GetResponseAsync()) - { - using (Stream stream = response.GetResponseStream()) - { - if (stream.Length > 0) - { - using (var sr = new StreamReader(stream)) - { - var json = await sr.ReadToEndAsync(); - result = JsonConvert.DeserializeObject(json); - - } - } - - } - } - } - catch (Exception ex) - { - Debug.WriteLine(ex.Message.ToString()); - } - return result; - } - } -} - diff --git a/Yavsc.Client/IGoogleCloudMobileDeclaration.cs b/Yavsc.Client/IGoogleCloudMobileDeclaration.cs index 9ea3033c..90f82c6b 100644 --- a/Yavsc.Client/IGoogleCloudMobileDeclaration.cs +++ b/Yavsc.Client/IGoogleCloudMobileDeclaration.cs @@ -1,4 +1,22 @@ -namespace Yavsc.Models.Identity +// Copyright (C) 2016 Paul Schneider +// +// This file is part of yavsc. +// +// yavsc is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 2 of the License, or +// (at your option) any later version. +// +// yavsc is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with yavsc. If not, see . +// + +namespace Yavsc.Models.Identity { public interface IGCMDeclaration { diff --git a/Yavsc.Client/Yavsc.Client.csproj b/Yavsc.Client/Yavsc.Client.csproj index d7771e2d..f1f42ced 100644 --- a/Yavsc.Client/Yavsc.Client.csproj +++ b/Yavsc.Client/Yavsc.Client.csproj @@ -35,7 +35,6 @@ 4 - @@ -54,22 +53,12 @@ - - ..\packages\Json.NET.Web.1.0.49\lib\portable45-net45+win8+wpa81\Json.NET.Web.dll - True - - - ..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll - True - - Ce projet fait référence à des packages NuGet qui sont manquants sur cet ordinateur. Utilisez l'option de restauration des packages NuGet pour les télécharger. Pour plus d'informations, consultez http://go.microsoft.com/fwlink/?LinkID=322105. Le fichier manquant est : {0}. - - \ No newline at end of file + diff --git a/Yavsc.Client/Yavsc.Client.sln b/Yavsc.Client/Yavsc.Client.sln new file mode 100644 index 00000000..88788b1f --- /dev/null +++ b/Yavsc.Client/Yavsc.Client.sln @@ -0,0 +1,17 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yavsc.Client", "Yavsc.Client.csproj", "{67F9D3A8-F71E-4428-913F-C37AE82CDB24}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|Any CPU.Build.0 = Debug|Any CPU + {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|Any CPU.ActiveCfg = Release|Any CPU + {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection +EndGlobal diff --git a/Yavsc.Client/Yavsc.Client.userprefs b/Yavsc.Client/Yavsc.Client.userprefs new file mode 100644 index 00000000..7c085fc0 --- /dev/null +++ b/Yavsc.Client/Yavsc.Client.userprefs @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Yavsc.Client/packages.config b/Yavsc.Client/packages.config index 3e864e39..569e1bea 100644 --- a/Yavsc.Client/packages.config +++ b/Yavsc.Client/packages.config @@ -1,5 +1,3 @@  - - - \ No newline at end of file + diff --git a/Yavsc.Client/project.json b/Yavsc.Client/project.json new file mode 100644 index 00000000..8e58e005 --- /dev/null +++ b/Yavsc.Client/project.json @@ -0,0 +1,21 @@ +{ + "version": "1.0.0-*", + "description": "Yavsc Client Api", + "authors": [ + "Paul Schneider" + ], + "tags": [ + "" + ], + "projectUrl": "", + "licenseUrl": "", + "tooling": { + "defaultNamespace": "Yavsc" + }, + "dependencies": { + "Microsoft.AspNet.SignalR.Client.Portable": "2.0.1" + }, + "frameworks": { + "net451": {} + } +} \ No newline at end of file diff --git a/Yavsc.Client/project.lock.json b/Yavsc.Client/project.lock.json new file mode 100644 index 00000000..a380b838 --- /dev/null +++ b/Yavsc.Client/project.lock.json @@ -0,0 +1,255 @@ +{ + "locked": false, + "version": 2, + "targets": { + ".NETFramework,Version=v4.5.1": { + "Microsoft.AspNet.SignalR.Client.Portable/2.0.1": { + "type": "package", + "dependencies": { + "Microsoft.Net.Http": "2.2.18", + "Newtonsoft.Json": "5.0.6" + }, + "compile": { + "lib/Microsoft.AspNet.SignalR.Client.dll": {} + }, + "runtime": { + "lib/Microsoft.AspNet.SignalR.Client.dll": {} + } + }, + "Microsoft.Bcl/1.1.3": { + "type": "package", + "dependencies": { + "Microsoft.Bcl.Build": "1.0.4" + }, + "compile": { + "lib/net45/_._": {} + }, + "runtime": { + "lib/net45/_._": {} + } + }, + "Microsoft.Bcl.Build/1.0.10": { + "type": "package" + }, + "Microsoft.Net.Http/2.2.18": { + "type": "package", + "dependencies": { + "Microsoft.Bcl": "1.1.3", + "Microsoft.Bcl.Build": "1.0.10" + }, + "frameworkAssemblies": [ + "System.Net.Http", + "System.Net.Http.WebRequest" + ], + "compile": { + "lib/net45/System.Net.Http.Extensions.dll": {}, + "lib/net45/System.Net.Http.Primitives.dll": {} + }, + "runtime": { + "lib/net45/System.Net.Http.Extensions.dll": {}, + "lib/net45/System.Net.Http.Primitives.dll": {} + } + }, + "Newtonsoft.Json/5.0.6": { + "type": "package", + "compile": { + "lib/net45/Newtonsoft.Json.dll": {} + }, + "runtime": { + "lib/net45/Newtonsoft.Json.dll": {} + } + } + } + }, + "libraries": { + "Microsoft.AspNet.SignalR.Client.Portable/2.0.1": { + "sha512": "IrbSa4V7I+sQbhXiZV+4FFAp0FKZ2Q+zJsbGmBUtixzWVksDytSl5zIOov8dAk6FiZWdvNOUigz8pbOJZL82Lw==", + "type": "package", + "files": [ + "Microsoft.AspNet.SignalR.Client.Portable.2.0.1.nupkg.sha512", + "Microsoft.AspNet.SignalR.Client.Portable.nuspec", + "lib/Microsoft.AspNet.SignalR.Client.XML", + "lib/Microsoft.AspNet.SignalR.Client.dll" + ] + }, + "Microsoft.Bcl/1.1.3": { + "sha512": "NlSh9kk1UyC25O5JJ6vM/omaEirx0Ysep3CMkFNluQbzlIE14eWNa2rHtmFV1NGAsA/OW6MYvuSi7T7aowD2jw==", + "type": "package", + "files": [ + "License-RTM.rtf", + "Microsoft.Bcl.1.1.3.nupkg.sha512", + "Microsoft.Bcl.nuspec", + "ReleaseNotes.txt", + "content/net45/_._", + "content/portable-net45+win8+wp8/_._", + "content/sl4/_._", + "content/sl5/_._", + "content/win8/_._", + "content/wp8/_._", + "lib/net40/System.IO.dll", + "lib/net40/System.IO.xml", + "lib/net40/System.Runtime.dll", + "lib/net40/System.Runtime.xml", + "lib/net40/System.Threading.Tasks.dll", + "lib/net40/System.Threading.Tasks.xml", + "lib/net40/ensureRedirect.xml", + "lib/net45/_._", + "lib/portable-net40+sl4+win8+wp71/System.IO.dll", + "lib/portable-net40+sl4+win8+wp71/System.IO.xml", + "lib/portable-net40+sl4+win8+wp71/System.Runtime.dll", + "lib/portable-net40+sl4+win8+wp71/System.Runtime.xml", + "lib/portable-net40+sl4+win8+wp71/System.Threading.Tasks.dll", + "lib/portable-net40+sl4+win8+wp71/System.Threading.Tasks.xml", + "lib/portable-net40+sl4+win8+wp71/ensureRedirect.xml", + "lib/portable-net40+sl4+win8+wp8/System.IO.dll", + "lib/portable-net40+sl4+win8+wp8/System.IO.xml", + "lib/portable-net40+sl4+win8+wp8/System.Runtime.dll", + "lib/portable-net40+sl4+win8+wp8/System.Runtime.xml", + "lib/portable-net40+sl4+win8+wp8/System.Threading.Tasks.dll", + "lib/portable-net40+sl4+win8+wp8/System.Threading.Tasks.xml", + "lib/portable-net40+sl4+win8+wp8/ensureRedirect.xml", + "lib/portable-net40+sl4+win8/System.IO.dll", + "lib/portable-net40+sl4+win8/System.IO.xml", + "lib/portable-net40+sl4+win8/System.Runtime.dll", + "lib/portable-net40+sl4+win8/System.Runtime.xml", + "lib/portable-net40+sl4+win8/System.Threading.Tasks.dll", + "lib/portable-net40+sl4+win8/System.Threading.Tasks.xml", + "lib/portable-net40+sl4+win8/ensureRedirect.xml", + "lib/portable-net40+sl5+win8+wp8/System.IO.dll", + "lib/portable-net40+sl5+win8+wp8/System.IO.xml", + "lib/portable-net40+sl5+win8+wp8/System.Runtime.dll", + "lib/portable-net40+sl5+win8+wp8/System.Runtime.xml", + "lib/portable-net40+sl5+win8+wp8/System.Threading.Tasks.dll", + "lib/portable-net40+sl5+win8+wp8/System.Threading.Tasks.xml", + "lib/portable-net40+sl5+win8+wp8/ensureRedirect.xml", + "lib/portable-net40+win8+wp8/System.IO.dll", + "lib/portable-net40+win8+wp8/System.IO.xml", + "lib/portable-net40+win8+wp8/System.Runtime.dll", + "lib/portable-net40+win8+wp8/System.Runtime.xml", + "lib/portable-net40+win8+wp8/System.Threading.Tasks.dll", + "lib/portable-net40+win8+wp8/System.Threading.Tasks.xml", + "lib/portable-net40+win8+wp8/ensureRedirect.xml", + "lib/portable-net40+win8/System.IO.dll", + "lib/portable-net40+win8/System.IO.xml", + "lib/portable-net40+win8/System.Runtime.dll", + "lib/portable-net40+win8/System.Runtime.xml", + "lib/portable-net40+win8/System.Threading.Tasks.dll", + "lib/portable-net40+win8/System.Threading.Tasks.xml", + "lib/portable-net40+win8/ensureRedirect.xml", + "lib/portable-net45+win8+wp8/_._", + "lib/sl4-windowsphone71/System.IO.dll", + "lib/sl4-windowsphone71/System.IO.xml", + "lib/sl4-windowsphone71/System.Runtime.dll", + "lib/sl4-windowsphone71/System.Runtime.xml", + "lib/sl4-windowsphone71/System.Threading.Tasks.dll", + "lib/sl4-windowsphone71/System.Threading.Tasks.xml", + "lib/sl4-windowsphone71/ensureRedirect.xml", + "lib/sl4/System.IO.dll", + "lib/sl4/System.IO.xml", + "lib/sl4/System.Runtime.dll", + "lib/sl4/System.Runtime.xml", + "lib/sl4/System.Threading.Tasks.dll", + "lib/sl4/System.Threading.Tasks.xml", + "lib/sl5/System.IO.dll", + "lib/sl5/System.IO.xml", + "lib/sl5/System.Runtime.dll", + "lib/sl5/System.Runtime.xml", + "lib/sl5/System.Threading.Tasks.dll", + "lib/sl5/System.Threading.Tasks.xml", + "lib/win8/_._", + "lib/wp8/_._" + ] + }, + "Microsoft.Bcl.Build/1.0.10": { + "sha512": "JpazBBc/JT6o76Gx2q3mxJlGHfv2gK+GTzaJ+PZjf2XNGQOcajNU4PKJqc0udRwmPunZP5GrMhiWUuDVkabh+A==", + "type": "package", + "files": [ + "License-Stable.rtf", + "Microsoft.Bcl.Build.1.0.10.nupkg.sha512", + "Microsoft.Bcl.Build.nuspec", + "content/net40/_._", + "content/netcore45/_._", + "content/portable-net40+win8+sl4+wp71/_._", + "content/sl4-windowsphone71/_._", + "content/sl4/_._", + "tools/Install.ps1", + "tools/Microsoft.Bcl.Build.Tasks.dll", + "tools/Microsoft.Bcl.Build.targets", + "tools/Uninstall.ps1" + ] + }, + "Microsoft.Net.Http/2.2.18": { + "sha512": "YSmLk8qh917EkfrP5ULL4Nu8mxpoz1fwd5pXwNPUlg4+grLWWpHyYPIMZKjxa7HOR5gsZ8ZfhaSoYzQyom8xUw==", + "type": "package", + "files": [ + "License-Stable.rtf", + "Microsoft.Net.Http.2.2.18.nupkg.sha512", + "Microsoft.Net.Http.nuspec", + "lib/net40/System.Net.Http.Extensions.XML", + "lib/net40/System.Net.Http.Extensions.dll", + "lib/net40/System.Net.Http.Primitives.dll", + "lib/net40/System.Net.Http.Primitives.xml", + "lib/net40/System.Net.Http.WebRequest.dll", + "lib/net40/System.Net.Http.WebRequest.xml", + "lib/net40/System.Net.Http.dll", + "lib/net40/System.Net.Http.xml", + "lib/net40/ensureRedirect.xml", + "lib/net45/System.Net.Http.Extensions.XML", + "lib/net45/System.Net.Http.Extensions.dll", + "lib/net45/System.Net.Http.Primitives.dll", + "lib/net45/System.Net.Http.Primitives.xml", + "lib/net45/ensureRedirect.xml", + "lib/portable-net40+sl4+win8+wp71/System.Net.Http.Extensions.XML", + "lib/portable-net40+sl4+win8+wp71/System.Net.Http.Extensions.dll", + "lib/portable-net40+sl4+win8+wp71/System.Net.Http.Primitives.XML", + "lib/portable-net40+sl4+win8+wp71/System.Net.Http.Primitives.dll", + "lib/portable-net40+sl4+win8+wp71/System.Net.Http.dll", + "lib/portable-net40+sl4+win8+wp71/System.Net.Http.xml", + "lib/portable-net40+sl4+win8+wp71/ensureRedirect.xml", + "lib/portable-net45+win8/System.Net.Http.Extensions.XML", + "lib/portable-net45+win8/System.Net.Http.Extensions.dll", + "lib/portable-net45+win8/System.Net.Http.Primitives.dll", + "lib/portable-net45+win8/System.Net.Http.Primitives.xml", + "lib/portable-net45+win8/ensureRedirect.xml", + "lib/sl4-windowsphone71/System.Net.Http.Extensions.XML", + "lib/sl4-windowsphone71/System.Net.Http.Extensions.dll", + "lib/sl4-windowsphone71/System.Net.Http.Primitives.XML", + "lib/sl4-windowsphone71/System.Net.Http.Primitives.dll", + "lib/sl4-windowsphone71/System.Net.Http.dll", + "lib/sl4-windowsphone71/System.Net.Http.xml", + "lib/win8/System.Net.Http.Extensions.XML", + "lib/win8/System.Net.Http.Extensions.dll", + "lib/win8/System.Net.Http.Primitives.dll", + "lib/win8/System.Net.Http.Primitives.xml" + ] + }, + "Newtonsoft.Json/5.0.6": { + "sha512": "Z594WlU7Wndv4vQxwsS7ym2y2Izsuw5U86UxQbx6YIKIjVju7V7OU4l1QQl5fM9AmPdzWIOxSlonzuQzzulMaw==", + "type": "package", + "files": [ + "Newtonsoft.Json.5.0.6.nupkg.sha512", + "Newtonsoft.Json.nuspec", + "lib/net20/Newtonsoft.Json.dll", + "lib/net20/Newtonsoft.Json.xml", + "lib/net35/Newtonsoft.Json.dll", + "lib/net35/Newtonsoft.Json.xml", + "lib/net40/Newtonsoft.Json.dll", + "lib/net40/Newtonsoft.Json.xml", + "lib/net45/Newtonsoft.Json.dll", + "lib/net45/Newtonsoft.Json.xml", + "lib/netcore45/Newtonsoft.Json.dll", + "lib/netcore45/Newtonsoft.Json.xml", + "lib/portable-net40+sl4+wp7+win8/Newtonsoft.Json.dll", + "lib/portable-net40+sl4+wp7+win8/Newtonsoft.Json.xml", + "lib/portable-net45+wp80+win8/Newtonsoft.Json.dll", + "lib/portable-net45+wp80+win8/Newtonsoft.Json.xml" + ] + } + }, + "projectFileDependencyGroups": { + "": [ + "Microsoft.AspNet.SignalR.Client.Portable >= 2.0.1" + ], + ".NETFramework,Version=v4.5.1": [] + } +} \ No newline at end of file diff --git a/Yavsc/ApiController/GCMController.cs b/Yavsc/ApiController/GCMController.cs index 10f817b9..1eb24391 100644 --- a/Yavsc/ApiController/GCMController.cs +++ b/Yavsc/ApiController/GCMController.cs @@ -1,3 +1,5 @@ + +using System; using System.Linq; using System.Security.Claims; using Microsoft.AspNet.Authorization; @@ -29,13 +31,16 @@ public class GCMController : Controller [FromBody] GoogleCloudMobileDeclaration declaration) { var uid = User.GetUserId(); + _logger.LogWarning($"Registering device with id:{declaration.DeviceId} for {uid}"); if (ModelState.IsValid) { - if (_context.GCMDevices.Any(d => d.DeviceId == declaration.DeviceId)) + var alreadyRegisteredDevice = _context.GCMDevices.FirstOrDefault(d => d.DeviceId == declaration.DeviceId); + var deviceAlreadyRegistered = (alreadyRegisteredDevice!=null); + if (deviceAlreadyRegistered) { - var alreadyRegisteredDevice = _context.GCMDevices.FirstOrDefault(d => d.DeviceId == declaration.DeviceId); // Override an exiting owner + alreadyRegisteredDevice.DeclarationDate = DateTime.Now; alreadyRegisteredDevice.DeviceOwnerId = uid; alreadyRegisteredDevice.GCMRegistrationId = declaration.GCMRegistrationId; alreadyRegisteredDevice.Model = declaration.Model; @@ -46,11 +51,12 @@ public class GCMController : Controller } else { + declaration.DeclarationDate = DateTime.Now; declaration.DeviceOwnerId = uid; _context.GCMDevices.Add(declaration); _context.SaveChanges(); } - return Ok(); + return Json(new { IsAnUpdate = deviceAlreadyRegistered }); } return new BadRequestObjectResult(ModelState); } diff --git a/Yavsc/Auth/UserTokenProvider.cs b/Yavsc/Auth/UserTokenProvider.cs index 3203fc2e..3eb08763 100644 --- a/Yavsc/Auth/UserTokenProvider.cs +++ b/Yavsc/Auth/UserTokenProvider.cs @@ -9,6 +9,10 @@ namespace Yavsc.Auth { public class UserTokenProvider : Microsoft.AspNet.Identity.IUserTokenProvider { + private MonoDataProtector protector=null; + public MonoDataProtector Protector { + get { return protector; } + } public Task CanGenerateTwoFactorTokenAsync(UserManager manager, ApplicationUser user) { @@ -27,12 +31,13 @@ namespace Yavsc.Auth { { var por = new MonoDataProtector(Constants.ApplicationName,new string[] { purpose } ); var userStamp = por.Unprotect(token); - string [] values = userStamp.Split(' '); + Console.WriteLine ("Unprotected: "+userStamp); + string [] values = userStamp.Split(';'); return Task.FromResult ( user.Id == values[0] && user.Email == values[1] && user.UserName == values[2]); } public static string UserStamp(ApplicationUser user) { - return $"{user.Id} {user.Email} {user.UserName}"; + return $"{user.Id};{user.Email};{user.UserName}"; } } } \ No newline at end of file diff --git a/Yavsc/Controllers/AccountController.cs b/Yavsc/Controllers/AccountController.cs index 5cd89538..0152780c 100644 --- a/Yavsc/Controllers/AccountController.cs +++ b/Yavsc/Controllers/AccountController.cs @@ -15,6 +15,7 @@ using Yavsc.Models; using Yavsc.Services; using Yavsc.ViewModels.Account; using Yavsc.Helpers; +using Microsoft.Extensions.Localization; namespace Yavsc.Controllers { @@ -30,6 +31,8 @@ namespace Yavsc.Controllers SmtpSettings _smtpSettings; TwilioSettings _twilioSettings; + IStringLocalizer _localizer; + // TwilioSettings _twilioSettings; public AccountController( @@ -38,7 +41,8 @@ namespace Yavsc.Controllers IEmailSender emailSender, IOptions siteSettings, IOptions smtpSettings, - ILoggerFactory loggerFactory, IOptions twilioSettings) + ILoggerFactory loggerFactory, IOptions twilioSettings, + IStringLocalizer localizer) { _userManager = userManager; _signInManager = signInManager; @@ -49,6 +53,7 @@ namespace Yavsc.Controllers _smtpSettings = smtpSettings.Value; _twilioSettings = twilioSettings.Value; _logger = loggerFactory.CreateLogger(); + _localizer = localizer; } @@ -70,6 +75,16 @@ namespace Yavsc.Controllers */ } + public ActionResult AccessDenied(string requestUrl = null) + { + ViewBag.UserIsSignedIn = User.IsSignedIn(); + if (string.IsNullOrWhiteSpace(requestUrl)) + if (string.IsNullOrWhiteSpace(Request.Headers["Referer"])) + requestUrl = "/"; + else requestUrl = Request.Headers["Referer"]; + return View("AccessDenied",requestUrl); + } + [HttpPost(Constants.LoginPath)] public async Task SignIn(SignInViewModel model) { @@ -325,10 +340,14 @@ namespace Yavsc.Controllers { if (ModelState.IsValid) { - var user = await _userManager.FindByNameAsync(model.Email); + var user = await _userManager.FindByEmailAsync(model.Email); if (user == null || !(await _userManager.IsEmailConfirmedAsync(user))) { // Don't reveal that the user does not exist or is not confirmed + if (user == null) + _logger.LogWarning($"ForgotPassword: Email {model.Email} not found"); + else + _logger.LogWarning($"ForgotPassword: Email {model.Email} not confirmed"); return View("ForgotPasswordConfirmation"); } @@ -336,8 +355,8 @@ namespace Yavsc.Controllers // Send an email with this link var code = await _userManager.GeneratePasswordResetTokenAsync(user); var callbackUrl = Url.Action("ResetPassword", "Account", new { userId = user.Id, code = code }, protocol: HttpContext.Request.Scheme); - await _emailSender.SendEmailAsync(_siteSettings,_smtpSettings,model.Email, "Reset Password", - "Please reset your password by clicking here: link"); + await _emailSender.SendEmailAsync(_siteSettings,_smtpSettings,model.Email, _localizer["Reset Password"], + _localizer["Please reset your password by following this link:"] + callbackUrl ); return View("ForgotPasswordConfirmation"); } @@ -356,7 +375,7 @@ namespace Yavsc.Controllers // // GET: /Account/ResetPassword [HttpGet] - public IActionResult ResetPassword(string code = null) + public IActionResult ResetPassword(string UserId, string code = null) { return code == null ? View("Error") : View(); } @@ -371,7 +390,7 @@ namespace Yavsc.Controllers { return View(model); } - var user = await _userManager.FindByNameAsync(model.Email); + var user = await _userManager.FindByEmailAsync(model.Email); if (user == null) { // Don't reveal that the user does not exist diff --git a/Yavsc/Controllers/BlogspotController.cs b/Yavsc/Controllers/BlogspotController.cs index ad672c6b..61e88c55 100644 --- a/Yavsc/Controllers/BlogspotController.cs +++ b/Yavsc/Controllers/BlogspotController.cs @@ -1,14 +1,15 @@ + +using System; using System.Linq; +using System.Security.Claims; +using System.Threading.Tasks; using Microsoft.AspNet.Identity; using Microsoft.AspNet.Mvc; using Microsoft.Extensions.Logging; -using Yavsc.Models; -using System; using Microsoft.AspNet.Authorization; -using System.Security.Claims; -using System.Threading.Tasks; using Microsoft.Data.Entity; using Microsoft.Extensions.OptionsModel; +using Yavsc.Models; // For more information on enabling Web API for empty projects, visit http://go.microsoft.com/fwlink/?LinkID=397860 diff --git a/Yavsc/Controllers/CommandController.cs b/Yavsc/Controllers/CommandController.cs index 7e926124..7883f195 100644 --- a/Yavsc/Controllers/CommandController.cs +++ b/Yavsc/Controllers/CommandController.cs @@ -96,7 +96,7 @@ namespace Yavsc.Controllers ); var pro = _context.Performers.Include( x => x.Performer).FirstOrDefault( - x => x.PerfomerId == id + x => x.PerformerId == id ); if (pro == null) return HttpNotFound(); @@ -107,7 +107,7 @@ namespace Yavsc.Controllers return View(new BookQuery(new Location(),DateTime.Now.AddHours(4)) { PerformerProfile = pro, - PerformerId = pro.PerfomerId, + PerformerId = pro.PerformerId, ClientId = userid, Client = user }); @@ -129,7 +129,7 @@ namespace Yavsc.Controllers u => u.Performer ).Include( u => u.Performer.Devices) .FirstOrDefault( - x => x.PerfomerId == command.PerformerId + x => x.PerformerId == command.PerformerId ); command.PerformerProfile = pro; var user = await _userManager.FindByIdAsync( @@ -152,12 +152,14 @@ namespace Yavsc.Controllers var regids = command.PerformerProfile.Performer .Devices.Select(d => d.GCMRegistrationId); var sregids = string.Join(",",regids); - _logger.LogWarning($"ApiKey: {_googleSettings.ApiKey} {sregids}"); grep = await _GCMSender.NotifyAsync(_googleSettings,regids,yaev); } // TODO setup a profile choice to allow notifications // both on mailbox and mobile // if (grep==null || grep.success<=0 || grep.failure>0) + ViewBag.GooglePayload=grep; + if (grep!=null) + _logger.LogWarning($"Performer: {command.PerformerProfile.Performer.UserName} success: {grep.success} failure: {grep.failure}"); await _emailSender.SendEmailAsync( _siteSettings, _smtpSettings, @@ -166,7 +168,8 @@ namespace Yavsc.Controllers $"{yaev.Description}\r\n-- \r\n{yaev.Comment}\r\n" ); } - return RedirectToAction("Index"); + ViewBag.GoogleSettings = _googleSettings; + return View("CommandConfirmation",command); } ViewBag.GoogleSettings = _googleSettings; return View(command); diff --git a/Yavsc/Controllers/EstimateController.cs b/Yavsc/Controllers/EstimateController.cs index cd2c240c..4b41411b 100644 --- a/Yavsc/Controllers/EstimateController.cs +++ b/Yavsc/Controllers/EstimateController.cs @@ -37,7 +37,7 @@ namespace Yavsc.Controllers return HttpNotFound(); } - RDVEstimate estimate = _context.Estimates + Estimate estimate = _context.Estimates .Include(e => e.Query) .Include(e => e.Query.PerformerProfile) .Include(e => e.Query.PerformerProfile.Performer) @@ -61,7 +61,7 @@ namespace Yavsc.Controllers // POST: Estimate/Create [HttpPost] [ValidateAntiForgeryToken] - public IActionResult Create(RDVEstimate estimate, + public IActionResult Create(Estimate estimate, ICollection newGraphics, ICollection newFiles ) @@ -75,7 +75,7 @@ namespace Yavsc.Controllers var perfomerProfile = _context.Performers .Include( perpr => perpr.Performer).FirstOrDefault( - x=>x.PerfomerId == estimate.Query.PerformerId + x=>x.PerformerId == estimate.Query.PerformerId ); var command = _context.BookQueries.FirstOrDefault( cmd => cmd.Id == estimate.CommandId @@ -115,7 +115,7 @@ namespace Yavsc.Controllers return HttpNotFound(); } - RDVEstimate estimate = _context.Estimates.Single(m => m.Id == id); + Estimate estimate = _context.Estimates.Single(m => m.Id == id); if (estimate == null) { return HttpNotFound(); @@ -127,7 +127,7 @@ namespace Yavsc.Controllers // POST: Estimate/Edit/5 [HttpPost] [ValidateAntiForgeryToken] - public IActionResult Edit(RDVEstimate estimate) + public IActionResult Edit(Estimate estimate) { if (ModelState.IsValid) { @@ -147,7 +147,7 @@ namespace Yavsc.Controllers return HttpNotFound(); } - RDVEstimate estimate = _context.Estimates.Single(m => m.Id == id); + Estimate estimate = _context.Estimates.Single(m => m.Id == id); if (estimate == null) { return HttpNotFound(); @@ -161,7 +161,7 @@ namespace Yavsc.Controllers [ValidateAntiForgeryToken] public IActionResult DeleteConfirmed(long id) { - RDVEstimate estimate = _context.Estimates.Single(m => m.Id == id); + Estimate estimate = _context.Estimates.Single(m => m.Id == id); _context.Estimates.Remove(estimate); _context.SaveChanges(); return RedirectToAction("Index"); diff --git a/Yavsc/Controllers/FrontOfficeController.cs b/Yavsc/Controllers/FrontOfficeController.cs index a7eb46f8..f68d0415 100644 --- a/Yavsc/Controllers/FrontOfficeController.cs +++ b/Yavsc/Controllers/FrontOfficeController.cs @@ -69,7 +69,7 @@ namespace Yavsc.Controllers var pro = _context.Performers.Include( pr => pr.Performer ).FirstOrDefault( - x=>x.PerfomerId == bookQuery.PerformerId + x=>x.PerformerId == bookQuery.PerformerId ); if (pro==null) return HttpNotFound(); @@ -95,7 +95,7 @@ namespace Yavsc.Controllers [Produces("text/x-tex"), Authorize, Route("Release/Estimate-{id}.tex")] - public RDVEstimate Estimate(long id) + public Estimate Estimate(long id) { var estimate = _context.Estimates.Include(x=>x.Query). Include(x=>x.Query.Client).FirstOrDefault(x=>x.Id==id); diff --git a/Yavsc/Controllers/ManageController.cs b/Yavsc/Controllers/ManageController.cs index 89cbcff7..c283a391 100644 --- a/Yavsc/Controllers/ManageController.cs +++ b/Yavsc/Controllers/ManageController.cs @@ -52,7 +52,7 @@ namespace Yavsc.Controllers IOptions googleSettings, IOptions paypalSettings, IOptions cinfoSettings, - IStringLocalizer SR, + IStringLocalizer SR, ILoggerFactory loggerFactory) { _dbContext = context; @@ -87,7 +87,7 @@ namespace Yavsc.Controllers var user = await GetCurrentUserAsync(); long pc = _dbContext.Blogspot.Count(x => x.AuthorId == user.Id); - + var model = new IndexViewModel { HasPassword = await _userManager.HasPasswordAsync(user), @@ -100,11 +100,11 @@ namespace Yavsc.Controllers Balance = user.AccountBalance, ActiveCommandCount = _dbContext.BookQueries.Count(x => (x.ClientId == user.Id) && (x.EventDate > DateTime.Now)), HasDedicatedCalendar = !string.IsNullOrEmpty(user.DedicatedGoogleCalendar), - Roles = await _userManager.GetRolesAsync (user) + Roles = await _userManager.GetRolesAsync(user) }; - if (_dbContext.Performers.Any(x => x.PerfomerId == user.Id)) + if (_dbContext.Performers.Any(x => x.PerformerId == user.Id)) { - var code = _dbContext.Performers.First(x => x.PerfomerId == user.Id).ActivityCode; + var code = _dbContext.Performers.First(x => x.PerformerId == user.Id).ActivityCode; model.Activity = _dbContext.Activities.First(x => x.Code == code); } return View(model); @@ -259,30 +259,31 @@ namespace Yavsc.Controllers { var credential = await _userManager.GetCredentialForGoogleApiAsync( _dbContext, User.GetUserId()); - if (credential==null) - return RedirectToAction("LinkLogin",new { provider = "Google" }); + if (credential == null) + return RedirectToAction("LinkLogin", new { provider = "Google" }); - try { - ViewBag.Calendars = new GoogleApis.CalendarApi(_googleSettings.ApiKey) - .GetCalendars(credential); - } - catch (WebException ex) + try + { + ViewBag.Calendars = new GoogleApis.CalendarApi(_googleSettings.ApiKey) + .GetCalendars(credential); + } + catch (WebException ex) + { + // a bug + _logger.LogError("Google token, an Forbidden calendar"); + if (ex.HResult == (int)HttpStatusCode.Forbidden) { - // a bug - _logger.LogError("Google token, an Forbidden calendar"); - if (ex.HResult == (int) HttpStatusCode.Forbidden) - { - return RedirectToAction("LinkLogin",new { provider = "Google" }); - } + return RedirectToAction("LinkLogin", new { provider = "Google" }); } - return View(new SetGoogleCalendarViewModel { ReturnUrl=returnUrl }); + } + return View(new SetGoogleCalendarViewModel { ReturnUrl = returnUrl }); } - [HttpPost,ValidateAntiForgeryToken, + [HttpPost, ValidateAntiForgeryToken, Authorize] public async Task SetGoogleCalendar(SetGoogleCalendarViewModel model) { - var user = _dbContext.Users.FirstOrDefault(u=>u.Id == User.GetUserId()); + var user = _dbContext.Users.FirstOrDefault(u => u.Id == User.GetUserId()); user.DedicatedGoogleCalendar = model.GoogleCalendarId; await _dbContext.SaveChangesAsync(); if (string.IsNullOrEmpty(model.ReturnUrl)) @@ -461,52 +462,69 @@ namespace Yavsc.Controllers { var user = GetCurrentUserAsync().Result; var uid = user.Id; - bool existing = _dbContext.Performers.Any(x => x.PerfomerId == uid); + bool existing = _dbContext.Performers.Any(x => x.PerformerId == uid); ViewBag.Activities = _dbContext.ActivityItems(null); ViewBag.GoogleSettings = _googleSettings; if (existing) { - var currentProfile = _dbContext.Performers.Include(x => x.OrganisationAddress) - .First(x => x.PerfomerId == uid); + var currentProfile = _dbContext.Performers.Include(x => x.OrganizationAddress) + .First(x => x.PerformerId == uid); string currentCode = currentProfile.ActivityCode; return View(currentProfile); } return View(new PerformerProfile { - PerfomerId = user.Id, - OrganisationAddress = new Location() + PerformerId = user.Id, + OrganizationAddress = new Location() }); } [HttpPost] - [ValidateAntiForgeryToken, Authorize] + [Authorize] public async Task SetActivity(PerformerProfile model) { var user = GetCurrentUserAsync().Result; var uid = user.Id; - - if (ModelState.IsValid) + try { - var taskCheck = await _cchecker.CheckAsync(model.SIREN); - if (!taskCheck.success) { - ModelState.AddModelError( - "SIREN", - _SR["Invalid company number"]+" ("+taskCheck.errorCode+")" + if (ModelState.IsValid) + { + var exSiren = await _dbContext.ExceptionsSIREN.FirstOrDefaultAsync( + ex => ex.SIREN == model.SIREN ); - _logger.LogWarning("Invalid company number, using key:"+_cinfoSettings.ApiKey); + if (exSiren != null) + { + _logger.LogInformation("Exception SIREN:"+exSiren); + } + else + { + var taskCheck = await _cchecker.CheckAsync(model.SIREN); + if (!taskCheck.success) + { + ModelState.AddModelError( + "SIREN", + _SR["Invalid company number"] + " (" + taskCheck.errorCode + ")" + ); + _logger.LogInformation("Invalid company number, using key:" + _cinfoSettings.ApiKey); + } + } } } + catch (Exception ex) + { + _logger.LogError(ex.Message); + } if (ModelState.IsValid) { - if (uid == model.PerfomerId) + if (uid == model.PerformerId) { - bool addrexists = _dbContext.Map.Any(x => model.OrganisationAddress.Id == x.Id); + bool addrexists = _dbContext.Map.Any(x => model.OrganizationAddress.Id == x.Id); if (!addrexists) { - _dbContext.Map.Add(model.OrganisationAddress); + _dbContext.Map.Add(model.OrganizationAddress); } - bool existing = _dbContext.Performers.Any(x => x.PerfomerId == uid); + bool existing = _dbContext.Performers.Any(x => x.PerformerId == uid); if (existing) { _dbContext.Update(model); @@ -518,7 +536,7 @@ namespace Yavsc.Controllers return RedirectToAction(nameof(Index), new { Message = message }); } - else ModelState.AddModelError(string.Empty, "Acces denied"); + else ModelState.AddModelError(string.Empty, $"Access denied ({uid} vs {model.PerformerId})"); } ViewBag.GoogleSettings = _googleSettings; ViewBag.Activities = _dbContext.ActivityItems(model.ActivityCode); @@ -530,11 +548,11 @@ namespace Yavsc.Controllers { var user = GetCurrentUserAsync().Result; var uid = user.Id; - bool existing = _dbContext.Performers.Any(x => x.PerfomerId == uid); + bool existing = _dbContext.Performers.Any(x => x.PerformerId == uid); if (existing) { _dbContext.Performers.Remove( - _dbContext.Performers.First(x => x.PerfomerId == uid) + _dbContext.Performers.First(x => x.PerformerId == uid) ); _dbContext.SaveChanges(); } diff --git a/Yavsc/Controllers/SIRENExceptionsController.cs b/Yavsc/Controllers/SIRENExceptionsController.cs new file mode 100644 index 00000000..9cd19866 --- /dev/null +++ b/Yavsc/Controllers/SIRENExceptionsController.cs @@ -0,0 +1,121 @@ +using System.Linq; +using Microsoft.AspNet.Authorization; +using Microsoft.AspNet.Mvc; +using Yavsc.Models; +using Yavsc.Models.Billing; + +namespace Yavsc.Controllers +{ + [Authorize(Roles="Administrator")] + public class SIRENExceptionsController : Controller + { + private ApplicationDbContext _context; + + public SIRENExceptionsController(ApplicationDbContext context) + { + _context = context; + } + + // GET: SIRENExceptions + public IActionResult Index() + { + return View(_context.ExceptionsSIREN.ToList()); + } + + // GET: SIRENExceptions/Details/5 + public IActionResult Details(string id) + { + if (id == null) + { + return HttpNotFound(); + } + + ExceptionSIREN exceptionSIREN = _context.ExceptionsSIREN.Single(m => m.SIREN == id); + if (exceptionSIREN == null) + { + return HttpNotFound(); + } + + return View(exceptionSIREN); + } + + // GET: SIRENExceptions/Create + public IActionResult Create() + { + return View(); + } + + // POST: SIRENExceptions/Create + [HttpPost] + [ValidateAntiForgeryToken] + public IActionResult Create(ExceptionSIREN exceptionSIREN) + { + if (ModelState.IsValid) + { + _context.ExceptionsSIREN.Add(exceptionSIREN); + _context.SaveChanges(); + return RedirectToAction("Index"); + } + return View(exceptionSIREN); + } + + // GET: SIRENExceptions/Edit/5 + public IActionResult Edit(string id) + { + if (id == null) + { + return HttpNotFound(); + } + + ExceptionSIREN exceptionSIREN = _context.ExceptionsSIREN.Single(m => m.SIREN == id); + if (exceptionSIREN == null) + { + return HttpNotFound(); + } + return View(exceptionSIREN); + } + + // POST: SIRENExceptions/Edit/5 + [HttpPost] + [ValidateAntiForgeryToken] + public IActionResult Edit(ExceptionSIREN exceptionSIREN) + { + if (ModelState.IsValid) + { + _context.Update(exceptionSIREN); + _context.SaveChanges(); + return RedirectToAction("Index"); + } + return View(exceptionSIREN); + } + + // GET: SIRENExceptions/Delete/5 + [ActionName("Delete")] + public IActionResult Delete(string id) + { + if (id == null) + { + return HttpNotFound(); + } + + ExceptionSIREN exceptionSIREN = _context.ExceptionsSIREN.Single(m => m.SIREN == id); + if (exceptionSIREN == null) + { + return HttpNotFound(); + } + + return View(exceptionSIREN); + } + + // POST: SIRENExceptions/Delete/5 + [HttpPost, ActionName("Delete")] + [ValidateAntiForgeryToken] + public IActionResult DeleteConfirmed(string id) + { + ExceptionSIREN exceptionSIREN = _context.ExceptionsSIREN.Single(m => m.SIREN == id); + _context.ExceptionsSIREN.Remove(exceptionSIREN); + _context.SaveChanges(); + return RedirectToAction("Index"); + } + } +} diff --git a/Yavsc/Helpers/EventHelpers.cs b/Yavsc/Helpers/EventHelpers.cs index 2db3929f..5277706d 100644 --- a/Yavsc/Helpers/EventHelpers.cs +++ b/Yavsc/Helpers/EventHelpers.cs @@ -6,17 +6,20 @@ namespace Yavsc.Helpers { public static class EventHelpers { - public static YaEvent CreateEvent(this BookQuery query, + public static BookQueryEvent CreateEvent(this BookQuery query, IStringLocalizer SR) { - var yaev = new YaEvent + var yaev = new BookQueryEvent { Title = query.Client.UserName + " "+ SR["is asking you for a date"]+".", Comment = (query.Previsional != null) ? SR["Deposit"] + string.Format(": {0:00}", query.Previsional) : SR["No deposit."], Description = SR["Address"] + ": " + query.Location.Address + "\n" + - SR["Date"] + ": " + query.EventDate.ToString("D") + SR["Date"] + ": " + query.EventDate.ToString("D"), + StartDate = query.EventDate, + Location = query.Location, + CommandId = query.Id }; return yaev; } diff --git a/Yavsc/Helpers/FileSystemHelpers.cs b/Yavsc/Helpers/FileSystemHelpers.cs index 74984222..62d88970 100644 --- a/Yavsc/Helpers/FileSystemHelpers.cs +++ b/Yavsc/Helpers/FileSystemHelpers.cs @@ -5,7 +5,7 @@ using Yavsc.Models.Billing; namespace Yavsc.Helpers { public static class FileSystemHelpers { - public static IDirectoryContents GetFileContent(this RDVEstimate estimate, string userFileDir) + public static IDirectoryContents GetFileContent(this Estimate estimate, string userFileDir) { if (estimate?.Query?.PerformerProfile?.Performer == null) return null; diff --git a/Yavsc/Helpers/SimpleJsonPostMethod.cs b/Yavsc/Helpers/SimpleJsonPostMethod.cs new file mode 100644 index 00000000..5e9ceacc --- /dev/null +++ b/Yavsc/Helpers/SimpleJsonPostMethod.cs @@ -0,0 +1,99 @@ +// +// PostJson.cs +// +// Author: +// Paul Schneider +// +// Copyright (c) 2015 Paul Schneider +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . +using System.Net; +using System.IO; +using System.Threading.Tasks; +using Newtonsoft.Json; +using System; +using System.Json; + +namespace Yavsc.Helpers +{ + /// + /// Simple json post method. + /// + public class SimpleJsonPostMethod : IDisposable + { + private HttpWebRequest request=null; + + /// + /// Initializes a new instance of the Yavsc.Helpers.SimpleJsonPostMethod class. + /// + /// Path to method. + public SimpleJsonPostMethod (string pathToMethod, string authorizationHeader = null) + { + request = (HttpWebRequest) WebRequest.Create (pathToMethod); + request.Method = "POST"; + request.Accept = "application/json"; + request.ContentType = "application/json"; + request.SendChunked = true; + request.TransferEncoding = "UTF-8"; + if (authorizationHeader!=null) + request.Headers["Authorization"]=authorizationHeader; + } + + public void Dispose() + { + request.Abort(); + } + + /// + /// Invoke the specified query. + /// + /// Query. + public TAnswer Invoke(object query) + { + + using (Stream streamQuery = request.GetRequestStream()) { + using (StreamWriter writer = new StreamWriter(streamQuery)) { + writer.Write (JsonConvert.SerializeObject(query)); + }} + TAnswer ans = default (TAnswer); + using (WebResponse response = request.GetResponse ()) { + using (Stream responseStream = response.GetResponseStream ()) { + using (StreamReader rdr = new StreamReader (responseStream)) { + ans = (TAnswer) JsonConvert.DeserializeObject (rdr.ReadToEnd ()); + } + } + response.Close(); + } + return ans; + } + + public async Task InvokeJson(object query) + { + JsonValue jsonDoc=null; + using (Stream streamQuery = request.GetRequestStream()) { + using (StreamWriter writer = new StreamWriter(streamQuery)) { + writer.Write (JsonConvert.SerializeObject(query)); + }} + using (WebResponse response = request.GetResponse ()) { + using (Stream stream = response.GetResponseStream ()) { + if (stream.Length>0) + jsonDoc = await Task.Run (() => JsonObject.Load (stream)); + } + response.Close(); + } + return jsonDoc; + } + } +} + diff --git a/Yavsc/Interfaces/IAccountBalance.cs b/Yavsc/Interfaces/IAccountBalance.cs new file mode 100644 index 00000000..9579903a --- /dev/null +++ b/Yavsc/Interfaces/IAccountBalance.cs @@ -0,0 +1,9 @@ +namespace Yavsc.Interfaces +{ + public interface IAccountBalance + { + long ContactCredits { get; set; } + decimal Credits { get; set; } + string UserId { get; set; } + } +} \ No newline at end of file diff --git a/Yavsc/Interfaces/IApplicationUser.cs b/Yavsc/Interfaces/IApplicationUser.cs new file mode 100644 index 00000000..c1da97c7 --- /dev/null +++ b/Yavsc/Interfaces/IApplicationUser.cs @@ -0,0 +1,15 @@ +using System.Collections.Generic; + +namespace Yavsc.Interfaces +{ + public interface IApplicationUser + { + IAccountBalance AccountBalance { get; set; } + IList Book { get; set; } + IList Circles { get; set; } + string DedicatedGoogleCalendar { get; set; } + IList Devices { get; set; } + ILocation PostalAddress { get; set; } + IList Posts { get; set; } + } +} diff --git a/Yavsc/Interfaces/IBlog.cs b/Yavsc/Interfaces/IBlog.cs new file mode 100644 index 00000000..790df7c7 --- /dev/null +++ b/Yavsc/Interfaces/IBlog.cs @@ -0,0 +1,11 @@ +namespace Yavsc.Interfaces +{ + public interface IBlog: IIdentified, IRating, ITitle, ILifeTime + + { + string AuthorId { get; set; } + string Content { get; set; } + string Photo { get; set; } + bool Visible { get; set; } + } +} \ No newline at end of file diff --git a/Yavsc/Interfaces/ICircle.cs b/Yavsc/Interfaces/ICircle.cs new file mode 100644 index 00000000..a61f5679 --- /dev/null +++ b/Yavsc/Interfaces/ICircle.cs @@ -0,0 +1,13 @@ +using System.Collections.Generic; + +namespace Yavsc.Interfaces +{ + public interface ICircle + { + long Id { get; set; } + IList Members { get; set; } + string Name { get; set; } + IApplicationUser Owner { get; set; } + string OwnerId { get; set; } + } +} \ No newline at end of file diff --git a/Yavsc/Interfaces/ICircleMember.cs b/Yavsc/Interfaces/ICircleMember.cs new file mode 100644 index 00000000..74528828 --- /dev/null +++ b/Yavsc/Interfaces/ICircleMember.cs @@ -0,0 +1,8 @@ +namespace Yavsc.Interfaces +{ + public interface ICircleMember: IIdentified + { + ICircle Circle { get; set; } + IApplicationUser Member { get; set; } + } +} \ No newline at end of file diff --git a/Yavsc/Interfaces/IContact.cs b/Yavsc/Interfaces/IContact.cs new file mode 100644 index 00000000..8be32e5f --- /dev/null +++ b/Yavsc/Interfaces/IContact.cs @@ -0,0 +1,9 @@ +namespace Yavsc.Interfaces +{ + public interface IContact + { + IApplicationUser Owner { get; set; } + string OwnerId { get; set; } + string UserId { get; set; } + } +} \ No newline at end of file diff --git a/Yavsc/Interfaces/IGoogleCloudMobileDeclaration.cs b/Yavsc/Interfaces/IGoogleCloudMobileDeclaration.cs new file mode 100644 index 00000000..2eb1d9b8 --- /dev/null +++ b/Yavsc/Interfaces/IGoogleCloudMobileDeclaration.cs @@ -0,0 +1,18 @@ +namespace Yavsc.Interfaces +{ + public interface IGCMDeclaration + { + string DeviceId { get; set; } + string GCMRegistrationId { get; set; } + string Model { get; set; } + string Platform { get; set; } + string Version { get; set; } + + } + + public interface IGoogleCloudMobileDeclaration: IGCMDeclaration + { + IApplicationUser DeviceOwner { get; set; } + string DeviceOwnerId { get; set; } + } +} \ No newline at end of file diff --git a/Yavsc.Api/Interfaces/IIdentified.cs b/Yavsc/Interfaces/IIdentified.cs similarity index 100% rename from Yavsc.Api/Interfaces/IIdentified.cs rename to Yavsc/Interfaces/IIdentified.cs diff --git a/Yavsc/Interfaces/ILifeTime.cs b/Yavsc/Interfaces/ILifeTime.cs new file mode 100644 index 00000000..fd82fefb --- /dev/null +++ b/Yavsc/Interfaces/ILifeTime.cs @@ -0,0 +1,10 @@ +using System; + +namespace Yavsc.Interfaces +{ + public interface ILifeTime + { + DateTime Modified { get; set; } + DateTime Posted { get; set; } + } +} diff --git a/Yavsc/Interfaces/ILocation.cs b/Yavsc/Interfaces/ILocation.cs new file mode 100644 index 00000000..614fa86a --- /dev/null +++ b/Yavsc/Interfaces/ILocation.cs @@ -0,0 +1,8 @@ +namespace Yavsc.Interfaces +{ + public interface ILocation + { + string Address { get; set; } + long Id { get; set; } + } +} \ No newline at end of file diff --git a/Yavsc.Api/Interfaces/IPerformerSpecified.cs b/Yavsc/Interfaces/IPerformerSpecified.cs similarity index 100% rename from Yavsc.Api/Interfaces/IPerformerSpecified.cs rename to Yavsc/Interfaces/IPerformerSpecified.cs diff --git a/Yavsc/Interfaces/IPosition.cs b/Yavsc/Interfaces/IPosition.cs new file mode 100644 index 00000000..d2b3dcc5 --- /dev/null +++ b/Yavsc/Interfaces/IPosition.cs @@ -0,0 +1,8 @@ +namespace Yavsc.Interfaces +{ + public interface IPosition + { + double Latitude { get; set; } + double Longitude { get; set; } + } +} \ No newline at end of file diff --git a/Yavsc.Api/Interfaces/IRating.cs b/Yavsc/Interfaces/IRating.cs similarity index 95% rename from Yavsc.Api/Interfaces/IRating.cs rename to Yavsc/Interfaces/IRating.cs index 9a34ebe7..496739f7 100644 --- a/Yavsc.Api/Interfaces/IRating.cs +++ b/Yavsc/Interfaces/IRating.cs @@ -24,7 +24,7 @@ namespace Yavsc.Interfaces /// /// I rating. /// - public interface IRating: IIdentified + public interface IRating: IIdentified { /// /// Gets or sets the rate. diff --git a/Yavsc.Api/Interfaces/ITitle.cs b/Yavsc/Interfaces/ITitle.cs similarity index 100% rename from Yavsc.Api/Interfaces/ITitle.cs rename to Yavsc/Interfaces/ITitle.cs diff --git a/Yavsc/Migrations/20160723164231_GCMRedDate.Designer.cs b/Yavsc/Migrations/20160723164231_GCMRedDate.Designer.cs new file mode 100644 index 00000000..a0221f1c --- /dev/null +++ b/Yavsc/Migrations/20160723164231_GCMRedDate.Designer.cs @@ -0,0 +1,663 @@ +using System; +using Microsoft.Data.Entity; +using Microsoft.Data.Entity.Infrastructure; +using Microsoft.Data.Entity.Migrations; +using Yavsc.Models; + +namespace Yavsc.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + [Migration("20160723164231_GCMRedDate")] + partial class GCMRedDate + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { + modelBuilder + .HasAnnotation("ProductVersion", "7.0.0-rc1-16348"); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRole", b => + { + b.Property("Id"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken(); + + b.Property("Name") + .HasAnnotation("MaxLength", 256); + + b.Property("NormalizedName") + .HasAnnotation("MaxLength", 256); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .HasAnnotation("Relational:Name", "RoleNameIndex"); + + b.HasAnnotation("Relational:TableName", "AspNetRoles"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClaimType"); + + b.Property("ClaimValue"); + + b.Property("RoleId") + .IsRequired(); + + b.HasKey("Id"); + + b.HasAnnotation("Relational:TableName", "AspNetRoleClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClaimType"); + + b.Property("ClaimValue"); + + b.Property("UserId") + .IsRequired(); + + b.HasKey("Id"); + + b.HasAnnotation("Relational:TableName", "AspNetUserClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserLogin", b => + { + b.Property("LoginProvider"); + + b.Property("ProviderKey"); + + b.Property("ProviderDisplayName"); + + b.Property("UserId") + .IsRequired(); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasAnnotation("Relational:TableName", "AspNetUserLogins"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole", b => + { + b.Property("UserId"); + + b.Property("RoleId"); + + b.HasKey("UserId", "RoleId"); + + b.HasAnnotation("Relational:TableName", "AspNetUserRoles"); + }); + + modelBuilder.Entity("Yavsc.Location", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Address") + .IsRequired(); + + b.Property("Latitude"); + + b.Property("Longitude"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.AccountBalance", b => + { + b.Property("UserId"); + + b.Property("ContactCredits"); + + b.Property("Credits"); + + b.HasKey("UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Activity", b => + { + b.Property("Code") + .HasAnnotation("MaxLength", 512); + + b.Property("ActorDenomination"); + + b.Property("Description"); + + b.Property("ModeratorGroupName"); + + b.Property("Name") + .IsRequired() + .HasAnnotation("MaxLength", 512); + + b.Property("Photo"); + + b.HasKey("Code"); + }); + + modelBuilder.Entity("Yavsc.Models.ApplicationUser", b => + { + b.Property("Id"); + + b.Property("AccessFailedCount"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken(); + + b.Property("DedicatedGoogleCalendar"); + + b.Property("Email") + .HasAnnotation("MaxLength", 256); + + b.Property("EmailConfirmed"); + + b.Property("LockoutEnabled"); + + b.Property("LockoutEnd"); + + b.Property("NormalizedEmail") + .HasAnnotation("MaxLength", 256); + + b.Property("NormalizedUserName") + .HasAnnotation("MaxLength", 256); + + b.Property("PasswordHash"); + + b.Property("PhoneNumber"); + + b.Property("PhoneNumberConfirmed"); + + b.Property("PostalAddressId"); + + b.Property("SecurityStamp"); + + b.Property("TwoFactorEnabled"); + + b.Property("UserName") + .HasAnnotation("MaxLength", 256); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasAnnotation("Relational:Name", "EmailIndex"); + + b.HasIndex("NormalizedUserName") + .HasAnnotation("Relational:Name", "UserNameIndex"); + + b.HasAnnotation("Relational:TableName", "AspNetUsers"); + }); + + modelBuilder.Entity("Yavsc.Models.Auth.Client", b => + { + b.Property("Id"); + + b.Property("Active"); + + b.Property("DisplayName"); + + b.Property("LogoutRedirectUri") + .HasAnnotation("MaxLength", 100); + + b.Property("RedirectUri"); + + b.Property("RefreshTokenLifeTime"); + + b.Property("Secret"); + + b.Property("Type"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Auth.RefreshToken", b => + { + b.Property("Id"); + + b.Property("ClientId") + .IsRequired() + .HasAnnotation("MaxLength", 50); + + b.Property("ExpiresUtc"); + + b.Property("IssuedUtc"); + + b.Property("ProtectedTicket") + .IsRequired(); + + b.Property("Subject") + .IsRequired() + .HasAnnotation("MaxLength", 50); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.BalanceImpact", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BalanceId") + .IsRequired(); + + b.Property("ExecDate"); + + b.Property("Impact"); + + b.Property("Reason") + .IsRequired(); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.CommandLine", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ArticleId"); + + b.Property("BookQueryId"); + + b.Property("Comment"); + + b.Property("Count"); + + b.Property("RDVEstimateId"); + + b.Property("UnitaryCost"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.RDVEstimate", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AttachedFilesString"); + + b.Property("AttachedGraphicsString"); + + b.Property("CommandId"); + + b.Property("Description"); + + b.Property("Status"); + + b.Property("Title"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Blog", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AuthorId") + .IsRequired(); + + b.Property("bcontent"); + + b.Property("modified"); + + b.Property("photo"); + + b.Property("posted"); + + b.Property("rate"); + + b.Property("title"); + + b.Property("visible"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Booking.BookQuery", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClientId") + .IsRequired(); + + b.Property("CreationDate") + .ValueGeneratedOnAdd() + .HasAnnotation("Relational:GeneratedValueSql", "LOCALTIMESTAMP"); + + b.Property("EventDate"); + + b.Property("Lag"); + + b.Property("LocationId"); + + b.Property("PerformerId") + .IsRequired(); + + b.Property("Previsional"); + + b.Property("ValidationDate"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Circle", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Name"); + + b.Property("OwnerId"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.CircleMember", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("CircleId") + .IsRequired(); + + b.Property("MemberId") + .IsRequired(); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Contact", b => + { + b.Property("OwnerId"); + + b.Property("UserId"); + + b.HasKey("OwnerId", "UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Identity.GoogleCloudMobileDeclaration", b => + { + b.Property("DeviceId"); + + b.Property("DeclarationDate") + .ValueGeneratedOnAdd() + .HasAnnotation("Relational:GeneratedValueSql", "LOCALTIMESTAMP"); + + b.Property("DeviceOwnerId"); + + b.Property("GCMRegistrationId") + .IsRequired(); + + b.Property("Model"); + + b.Property("Platform"); + + b.Property("Version"); + + b.HasKey("DeviceId"); + }); + + modelBuilder.Entity("Yavsc.Models.Market.BaseProduct", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Description"); + + b.Property("Name"); + + b.Property("Public"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Market.Service", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Billing"); + + b.Property("ContextId"); + + b.Property("Description"); + + b.Property("Name"); + + b.Property("Pricing"); + + b.Property("Public"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.OAuth.OAuth2Tokens", b => + { + b.Property("UserId"); + + b.Property("AccessToken"); + + b.Property("Expiration"); + + b.Property("ExpiresIn"); + + b.Property("RefreshToken"); + + b.Property("TokenType"); + + b.HasKey("UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Skill", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Name"); + + b.Property("Rate"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.PerformerProfile", b => + { + b.Property("PerfomerId"); + + b.Property("AcceptGeoLocalisation"); + + b.Property("AcceptNotifications"); + + b.Property("AcceptPublicContact"); + + b.Property("Active"); + + b.Property("ActivityCode") + .IsRequired(); + + b.Property("MaxDailyCost"); + + b.Property("MinDailyCost"); + + b.Property("OfferId"); + + b.Property("OrganisationAddressId"); + + b.Property("Rate"); + + b.Property("SIREN") + .IsRequired() + .HasAnnotation("MaxLength", 14); + + b.Property("WebSite"); + + b.HasKey("PerfomerId"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRoleClaim", b => + { + b.HasOne("Microsoft.AspNet.Identity.EntityFramework.IdentityRole") + .WithMany() + .HasForeignKey("RoleId"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserClaim", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserLogin", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole", b => + { + b.HasOne("Microsoft.AspNet.Identity.EntityFramework.IdentityRole") + .WithMany() + .HasForeignKey("RoleId"); + + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.AccountBalance", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithOne() + .HasForeignKey("Yavsc.Models.AccountBalance", "UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.ApplicationUser", b => + { + b.HasOne("Yavsc.Location") + .WithMany() + .HasForeignKey("PostalAddressId"); + }); + + modelBuilder.Entity("Yavsc.Models.BalanceImpact", b => + { + b.HasOne("Yavsc.Models.AccountBalance") + .WithMany() + .HasForeignKey("BalanceId"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.CommandLine", b => + { + b.HasOne("Yavsc.Models.Market.BaseProduct") + .WithMany() + .HasForeignKey("ArticleId"); + + b.HasOne("Yavsc.Models.Booking.BookQuery") + .WithMany() + .HasForeignKey("BookQueryId"); + + b.HasOne("Yavsc.Models.Billing.RDVEstimate") + .WithMany() + .HasForeignKey("RDVEstimateId"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.RDVEstimate", b => + { + b.HasOne("Yavsc.Models.Booking.BookQuery") + .WithMany() + .HasForeignKey("CommandId"); + }); + + modelBuilder.Entity("Yavsc.Models.Blog", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("AuthorId"); + }); + + modelBuilder.Entity("Yavsc.Models.Booking.BookQuery", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("ClientId"); + + b.HasOne("Yavsc.Location") + .WithMany() + .HasForeignKey("LocationId"); + + b.HasOne("Yavsc.Models.Workflow.PerformerProfile") + .WithMany() + .HasForeignKey("PerformerId"); + }); + + modelBuilder.Entity("Yavsc.Models.Circle", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("OwnerId"); + }); + + modelBuilder.Entity("Yavsc.Models.CircleMember", b => + { + b.HasOne("Yavsc.Models.Circle") + .WithMany() + .HasForeignKey("CircleId"); + + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("MemberId"); + }); + + modelBuilder.Entity("Yavsc.Models.Contact", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("OwnerId"); + }); + + modelBuilder.Entity("Yavsc.Models.Identity.GoogleCloudMobileDeclaration", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("DeviceOwnerId"); + }); + + modelBuilder.Entity("Yavsc.Models.Market.Service", b => + { + b.HasOne("Yavsc.Models.Activity") + .WithMany() + .HasForeignKey("ContextId"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.PerformerProfile", b => + { + b.HasOne("Yavsc.Models.Activity") + .WithMany() + .HasForeignKey("ActivityCode"); + + b.HasOne("Yavsc.Models.Market.Service") + .WithMany() + .HasForeignKey("OfferId"); + + b.HasOne("Yavsc.Location") + .WithMany() + .HasForeignKey("OrganisationAddressId"); + + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("PerfomerId"); + }); + } + } +} diff --git a/Yavsc/Migrations/20160723164231_GCMRedDate.cs b/Yavsc/Migrations/20160723164231_GCMRedDate.cs new file mode 100644 index 00000000..32babb83 --- /dev/null +++ b/Yavsc/Migrations/20160723164231_GCMRedDate.cs @@ -0,0 +1,286 @@ +using System; +using Microsoft.Data.Entity.Migrations; + +namespace Yavsc.Migrations +{ + public partial class GCMRedDate : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey(name: "FK_IdentityRoleClaim_IdentityRole_RoleId", table: "AspNetRoleClaims"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserClaim_ApplicationUser_UserId", table: "AspNetUserClaims"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserLogin_ApplicationUser_UserId", table: "AspNetUserLogins"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole_IdentityRole_RoleId", table: "AspNetUserRoles"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole_ApplicationUser_UserId", table: "AspNetUserRoles"); + migrationBuilder.DropForeignKey(name: "FK_AccountBalance_ApplicationUser_UserId", table: "AccountBalance"); + migrationBuilder.DropForeignKey(name: "FK_BalanceImpact_AccountBalance_BalanceId", table: "BalanceImpact"); + migrationBuilder.DropForeignKey(name: "FK_Blog_ApplicationUser_AuthorId", table: "Blog"); + migrationBuilder.DropForeignKey(name: "FK_BookQuery_ApplicationUser_ClientId", table: "BookQuery"); + migrationBuilder.DropForeignKey(name: "FK_BookQuery_PerformerProfile_PerformerId", table: "BookQuery"); + migrationBuilder.DropForeignKey(name: "FK_CircleMember_Circle_CircleId", table: "CircleMember"); + migrationBuilder.DropForeignKey(name: "FK_CircleMember_ApplicationUser_MemberId", table: "CircleMember"); + migrationBuilder.DropForeignKey(name: "FK_Contact_ApplicationUser_OwnerId", table: "Contact"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Activity_ActivityCode", table: "PerformerProfile"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Location_OrganisationAddressId", table: "PerformerProfile"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_ApplicationUser_PerfomerId", table: "PerformerProfile"); + migrationBuilder.AlterColumn( + name: "GCMRegistrationId", + table: "GoogleCloudMobileDeclaration", + nullable: false); + migrationBuilder.AddColumn( + name: "DeclarationDate", + table: "GoogleCloudMobileDeclaration", + nullable: false, + defaultValueSql: "LOCALTIMESTAMP"); + migrationBuilder.AddForeignKey( + name: "FK_IdentityRoleClaim_IdentityRole_RoleId", + table: "AspNetRoleClaims", + column: "RoleId", + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserClaim_ApplicationUser_UserId", + table: "AspNetUserClaims", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserLogin_ApplicationUser_UserId", + table: "AspNetUserLogins", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserRole_IdentityRole_RoleId", + table: "AspNetUserRoles", + column: "RoleId", + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserRole_ApplicationUser_UserId", + table: "AspNetUserRoles", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_AccountBalance_ApplicationUser_UserId", + table: "AccountBalance", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_BalanceImpact_AccountBalance_BalanceId", + table: "BalanceImpact", + column: "BalanceId", + principalTable: "AccountBalance", + principalColumn: "UserId", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_Blog_ApplicationUser_AuthorId", + table: "Blog", + column: "AuthorId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_BookQuery_ApplicationUser_ClientId", + table: "BookQuery", + column: "ClientId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_BookQuery_PerformerProfile_PerformerId", + table: "BookQuery", + column: "PerformerId", + principalTable: "PerformerProfile", + principalColumn: "PerfomerId", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_CircleMember_Circle_CircleId", + table: "CircleMember", + column: "CircleId", + principalTable: "Circle", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_CircleMember_ApplicationUser_MemberId", + table: "CircleMember", + column: "MemberId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_Contact_ApplicationUser_OwnerId", + table: "Contact", + column: "OwnerId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_Activity_ActivityCode", + table: "PerformerProfile", + column: "ActivityCode", + principalTable: "Activity", + principalColumn: "Code", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_Location_OrganisationAddressId", + table: "PerformerProfile", + column: "OrganisationAddressId", + principalTable: "Location", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_ApplicationUser_PerfomerId", + table: "PerformerProfile", + column: "PerfomerId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey(name: "FK_IdentityRoleClaim_IdentityRole_RoleId", table: "AspNetRoleClaims"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserClaim_ApplicationUser_UserId", table: "AspNetUserClaims"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserLogin_ApplicationUser_UserId", table: "AspNetUserLogins"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole_IdentityRole_RoleId", table: "AspNetUserRoles"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole_ApplicationUser_UserId", table: "AspNetUserRoles"); + migrationBuilder.DropForeignKey(name: "FK_AccountBalance_ApplicationUser_UserId", table: "AccountBalance"); + migrationBuilder.DropForeignKey(name: "FK_BalanceImpact_AccountBalance_BalanceId", table: "BalanceImpact"); + migrationBuilder.DropForeignKey(name: "FK_Blog_ApplicationUser_AuthorId", table: "Blog"); + migrationBuilder.DropForeignKey(name: "FK_BookQuery_ApplicationUser_ClientId", table: "BookQuery"); + migrationBuilder.DropForeignKey(name: "FK_BookQuery_PerformerProfile_PerformerId", table: "BookQuery"); + migrationBuilder.DropForeignKey(name: "FK_CircleMember_Circle_CircleId", table: "CircleMember"); + migrationBuilder.DropForeignKey(name: "FK_CircleMember_ApplicationUser_MemberId", table: "CircleMember"); + migrationBuilder.DropForeignKey(name: "FK_Contact_ApplicationUser_OwnerId", table: "Contact"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Activity_ActivityCode", table: "PerformerProfile"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Location_OrganisationAddressId", table: "PerformerProfile"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_ApplicationUser_PerfomerId", table: "PerformerProfile"); + migrationBuilder.DropColumn(name: "DeclarationDate", table: "GoogleCloudMobileDeclaration"); + migrationBuilder.AlterColumn( + name: "GCMRegistrationId", + table: "GoogleCloudMobileDeclaration", + nullable: true); + migrationBuilder.AddForeignKey( + name: "FK_IdentityRoleClaim_IdentityRole_RoleId", + table: "AspNetRoleClaims", + column: "RoleId", + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserClaim_ApplicationUser_UserId", + table: "AspNetUserClaims", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserLogin_ApplicationUser_UserId", + table: "AspNetUserLogins", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserRole_IdentityRole_RoleId", + table: "AspNetUserRoles", + column: "RoleId", + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserRole_ApplicationUser_UserId", + table: "AspNetUserRoles", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_AccountBalance_ApplicationUser_UserId", + table: "AccountBalance", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_BalanceImpact_AccountBalance_BalanceId", + table: "BalanceImpact", + column: "BalanceId", + principalTable: "AccountBalance", + principalColumn: "UserId", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_Blog_ApplicationUser_AuthorId", + table: "Blog", + column: "AuthorId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_BookQuery_ApplicationUser_ClientId", + table: "BookQuery", + column: "ClientId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_BookQuery_PerformerProfile_PerformerId", + table: "BookQuery", + column: "PerformerId", + principalTable: "PerformerProfile", + principalColumn: "PerfomerId", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_CircleMember_Circle_CircleId", + table: "CircleMember", + column: "CircleId", + principalTable: "Circle", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_CircleMember_ApplicationUser_MemberId", + table: "CircleMember", + column: "MemberId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_Contact_ApplicationUser_OwnerId", + table: "Contact", + column: "OwnerId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_Activity_ActivityCode", + table: "PerformerProfile", + column: "ActivityCode", + principalTable: "Activity", + principalColumn: "Code", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_Location_OrganisationAddressId", + table: "PerformerProfile", + column: "OrganisationAddressId", + principalTable: "Location", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_ApplicationUser_PerfomerId", + table: "PerformerProfile", + column: "PerfomerId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + } + } +} diff --git a/Yavsc/Migrations/20160725145306_estimates.Designer.cs b/Yavsc/Migrations/20160725145306_estimates.Designer.cs new file mode 100644 index 00000000..dda1fe31 --- /dev/null +++ b/Yavsc/Migrations/20160725145306_estimates.Designer.cs @@ -0,0 +1,664 @@ +using System; +using Microsoft.Data.Entity; +using Microsoft.Data.Entity.Infrastructure; +using Microsoft.Data.Entity.Migrations; +using Yavsc.Models; + +namespace Yavsc.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + [Migration("20160725145306_estimates")] + partial class estimates + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { + modelBuilder + .HasAnnotation("ProductVersion", "7.0.0-rc1-16348"); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRole", b => + { + b.Property("Id"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken(); + + b.Property("Name") + .HasAnnotation("MaxLength", 256); + + b.Property("NormalizedName") + .HasAnnotation("MaxLength", 256); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .HasAnnotation("Relational:Name", "RoleNameIndex"); + + b.HasAnnotation("Relational:TableName", "AspNetRoles"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClaimType"); + + b.Property("ClaimValue"); + + b.Property("RoleId") + .IsRequired(); + + b.HasKey("Id"); + + b.HasAnnotation("Relational:TableName", "AspNetRoleClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClaimType"); + + b.Property("ClaimValue"); + + b.Property("UserId") + .IsRequired(); + + b.HasKey("Id"); + + b.HasAnnotation("Relational:TableName", "AspNetUserClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserLogin", b => + { + b.Property("LoginProvider"); + + b.Property("ProviderKey"); + + b.Property("ProviderDisplayName"); + + b.Property("UserId") + .IsRequired(); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasAnnotation("Relational:TableName", "AspNetUserLogins"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole", b => + { + b.Property("UserId"); + + b.Property("RoleId"); + + b.HasKey("UserId", "RoleId"); + + b.HasAnnotation("Relational:TableName", "AspNetUserRoles"); + }); + + modelBuilder.Entity("Yavsc.Location", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Address") + .IsRequired(); + + b.Property("Latitude"); + + b.Property("Longitude"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.AccountBalance", b => + { + b.Property("UserId"); + + b.Property("ContactCredits"); + + b.Property("Credits"); + + b.HasKey("UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Activity", b => + { + b.Property("Code") + .HasAnnotation("MaxLength", 512); + + b.Property("ActorDenomination"); + + b.Property("Description"); + + b.Property("ModeratorGroupName"); + + b.Property("Name") + .IsRequired() + .HasAnnotation("MaxLength", 512); + + b.Property("Photo"); + + b.HasKey("Code"); + }); + + modelBuilder.Entity("Yavsc.Models.ApplicationUser", b => + { + b.Property("Id"); + + b.Property("AccessFailedCount"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken(); + + b.Property("DedicatedGoogleCalendar"); + + b.Property("Email") + .HasAnnotation("MaxLength", 256); + + b.Property("EmailConfirmed"); + + b.Property("LockoutEnabled"); + + b.Property("LockoutEnd"); + + b.Property("NormalizedEmail") + .HasAnnotation("MaxLength", 256); + + b.Property("NormalizedUserName") + .HasAnnotation("MaxLength", 256); + + b.Property("PasswordHash"); + + b.Property("PhoneNumber"); + + b.Property("PhoneNumberConfirmed"); + + b.Property("PostalAddressId"); + + b.Property("SecurityStamp"); + + b.Property("TwoFactorEnabled"); + + b.Property("UserName") + .HasAnnotation("MaxLength", 256); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasAnnotation("Relational:Name", "EmailIndex"); + + b.HasIndex("NormalizedUserName") + .HasAnnotation("Relational:Name", "UserNameIndex"); + + b.HasAnnotation("Relational:TableName", "AspNetUsers"); + }); + + modelBuilder.Entity("Yavsc.Models.Auth.Client", b => + { + b.Property("Id"); + + b.Property("Active"); + + b.Property("DisplayName"); + + b.Property("LogoutRedirectUri") + .HasAnnotation("MaxLength", 100); + + b.Property("RedirectUri"); + + b.Property("RefreshTokenLifeTime"); + + b.Property("Secret"); + + b.Property("Type"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Auth.RefreshToken", b => + { + b.Property("Id"); + + b.Property("ClientId") + .IsRequired() + .HasAnnotation("MaxLength", 50); + + b.Property("ExpiresUtc"); + + b.Property("IssuedUtc"); + + b.Property("ProtectedTicket") + .IsRequired(); + + b.Property("Subject") + .IsRequired() + .HasAnnotation("MaxLength", 50); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.BalanceImpact", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BalanceId") + .IsRequired(); + + b.Property("ExecDate"); + + b.Property("Impact"); + + b.Property("Reason") + .IsRequired(); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.CommandLine", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ArticleId"); + + b.Property("BookQueryId"); + + b.Property("Comment"); + + b.Property("Count"); + + b.Property("EstimateId"); + + b.Property("UnitaryCost"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.Estimate", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AttachedFilesString"); + + b.Property("AttachedGraphicsString"); + + b.Property("CommandId"); + + b.Property("Description"); + + b.Property("Status"); + + b.Property("Title"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Blog", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AuthorId"); + + b.Property("bcontent"); + + b.Property("modified"); + + b.Property("photo"); + + b.Property("posted") + .ValueGeneratedOnAdd() + .HasAnnotation("Relational:GeneratedValueSql", "LOCALTIMESTAMP"); + + b.Property("rate"); + + b.Property("title"); + + b.Property("visible"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Booking.BookQuery", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClientId") + .IsRequired(); + + b.Property("CreationDate") + .ValueGeneratedOnAdd() + .HasAnnotation("Relational:GeneratedValueSql", "LOCALTIMESTAMP"); + + b.Property("EventDate"); + + b.Property("Lag"); + + b.Property("LocationId"); + + b.Property("PerformerId") + .IsRequired(); + + b.Property("Previsional"); + + b.Property("ValidationDate"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Circle", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Name"); + + b.Property("OwnerId"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.CircleMember", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("CircleId") + .IsRequired(); + + b.Property("MemberId") + .IsRequired(); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Contact", b => + { + b.Property("OwnerId"); + + b.Property("UserId"); + + b.HasKey("OwnerId", "UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Identity.GoogleCloudMobileDeclaration", b => + { + b.Property("DeviceId"); + + b.Property("DeclarationDate") + .ValueGeneratedOnAdd() + .HasAnnotation("Relational:GeneratedValueSql", "LOCALTIMESTAMP"); + + b.Property("DeviceOwnerId"); + + b.Property("GCMRegistrationId") + .IsRequired(); + + b.Property("Model"); + + b.Property("Platform"); + + b.Property("Version"); + + b.HasKey("DeviceId"); + }); + + modelBuilder.Entity("Yavsc.Models.Market.BaseProduct", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Description"); + + b.Property("Name"); + + b.Property("Public"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Market.Service", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Billing"); + + b.Property("ContextId"); + + b.Property("Description"); + + b.Property("Name"); + + b.Property("Pricing"); + + b.Property("Public"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.OAuth.OAuth2Tokens", b => + { + b.Property("UserId"); + + b.Property("AccessToken"); + + b.Property("Expiration"); + + b.Property("ExpiresIn"); + + b.Property("RefreshToken"); + + b.Property("TokenType"); + + b.HasKey("UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Skill", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Name"); + + b.Property("Rate"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.PerformerProfile", b => + { + b.Property("PerfomerId"); + + b.Property("AcceptGeoLocalisation"); + + b.Property("AcceptNotifications"); + + b.Property("AcceptPublicContact"); + + b.Property("Active"); + + b.Property("ActivityCode") + .IsRequired(); + + b.Property("MaxDailyCost"); + + b.Property("MinDailyCost"); + + b.Property("OfferId"); + + b.Property("OrganisationAddressId"); + + b.Property("Rate"); + + b.Property("SIREN") + .IsRequired() + .HasAnnotation("MaxLength", 14); + + b.Property("WebSite"); + + b.HasKey("PerfomerId"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRoleClaim", b => + { + b.HasOne("Microsoft.AspNet.Identity.EntityFramework.IdentityRole") + .WithMany() + .HasForeignKey("RoleId"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserClaim", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserLogin", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole", b => + { + b.HasOne("Microsoft.AspNet.Identity.EntityFramework.IdentityRole") + .WithMany() + .HasForeignKey("RoleId"); + + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.AccountBalance", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithOne() + .HasForeignKey("Yavsc.Models.AccountBalance", "UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.ApplicationUser", b => + { + b.HasOne("Yavsc.Location") + .WithMany() + .HasForeignKey("PostalAddressId"); + }); + + modelBuilder.Entity("Yavsc.Models.BalanceImpact", b => + { + b.HasOne("Yavsc.Models.AccountBalance") + .WithMany() + .HasForeignKey("BalanceId"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.CommandLine", b => + { + b.HasOne("Yavsc.Models.Market.BaseProduct") + .WithMany() + .HasForeignKey("ArticleId"); + + b.HasOne("Yavsc.Models.Booking.BookQuery") + .WithMany() + .HasForeignKey("BookQueryId"); + + b.HasOne("Yavsc.Models.Billing.Estimate") + .WithMany() + .HasForeignKey("EstimateId"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.Estimate", b => + { + b.HasOne("Yavsc.Models.Booking.BookQuery") + .WithMany() + .HasForeignKey("CommandId"); + }); + + modelBuilder.Entity("Yavsc.Models.Blog", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("AuthorId"); + }); + + modelBuilder.Entity("Yavsc.Models.Booking.BookQuery", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("ClientId"); + + b.HasOne("Yavsc.Location") + .WithMany() + .HasForeignKey("LocationId"); + + b.HasOne("Yavsc.Models.Workflow.PerformerProfile") + .WithMany() + .HasForeignKey("PerformerId"); + }); + + modelBuilder.Entity("Yavsc.Models.Circle", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("OwnerId"); + }); + + modelBuilder.Entity("Yavsc.Models.CircleMember", b => + { + b.HasOne("Yavsc.Models.Circle") + .WithMany() + .HasForeignKey("CircleId"); + + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("MemberId"); + }); + + modelBuilder.Entity("Yavsc.Models.Contact", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("OwnerId"); + }); + + modelBuilder.Entity("Yavsc.Models.Identity.GoogleCloudMobileDeclaration", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("DeviceOwnerId"); + }); + + modelBuilder.Entity("Yavsc.Models.Market.Service", b => + { + b.HasOne("Yavsc.Models.Activity") + .WithMany() + .HasForeignKey("ContextId"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.PerformerProfile", b => + { + b.HasOne("Yavsc.Models.Activity") + .WithMany() + .HasForeignKey("ActivityCode"); + + b.HasOne("Yavsc.Models.Market.Service") + .WithMany() + .HasForeignKey("OfferId"); + + b.HasOne("Yavsc.Location") + .WithMany() + .HasForeignKey("OrganisationAddressId"); + + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("PerfomerId"); + }); + } + } +} diff --git a/Yavsc/Migrations/20160725145306_estimates.cs b/Yavsc/Migrations/20160725145306_estimates.cs new file mode 100644 index 00000000..fb56ae8d --- /dev/null +++ b/Yavsc/Migrations/20160725145306_estimates.cs @@ -0,0 +1,347 @@ +using System; +using Microsoft.Data.Entity.Migrations; + +namespace Yavsc.Migrations +{ + public partial class estimates : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey(name: "FK_IdentityRoleClaim_IdentityRole_RoleId", table: "AspNetRoleClaims"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserClaim_ApplicationUser_UserId", table: "AspNetUserClaims"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserLogin_ApplicationUser_UserId", table: "AspNetUserLogins"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole_IdentityRole_RoleId", table: "AspNetUserRoles"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole_ApplicationUser_UserId", table: "AspNetUserRoles"); + migrationBuilder.DropForeignKey(name: "FK_AccountBalance_ApplicationUser_UserId", table: "AccountBalance"); + migrationBuilder.DropForeignKey(name: "FK_BalanceImpact_AccountBalance_BalanceId", table: "BalanceImpact"); + migrationBuilder.DropForeignKey(name: "FK_CommandLine_RDVEstimate_RDVEstimateId", table: "CommandLine"); + migrationBuilder.DropForeignKey(name: "FK_BookQuery_ApplicationUser_ClientId", table: "BookQuery"); + migrationBuilder.DropForeignKey(name: "FK_BookQuery_PerformerProfile_PerformerId", table: "BookQuery"); + migrationBuilder.DropForeignKey(name: "FK_CircleMember_Circle_CircleId", table: "CircleMember"); + migrationBuilder.DropForeignKey(name: "FK_CircleMember_ApplicationUser_MemberId", table: "CircleMember"); + migrationBuilder.DropForeignKey(name: "FK_Contact_ApplicationUser_OwnerId", table: "Contact"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Activity_ActivityCode", table: "PerformerProfile"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Location_OrganisationAddressId", table: "PerformerProfile"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_ApplicationUser_PerfomerId", table: "PerformerProfile"); + migrationBuilder.DropColumn(name: "RDVEstimateId", table: "CommandLine"); + migrationBuilder.DropTable("RDVEstimate"); + migrationBuilder.CreateTable( + name: "Estimate", + columns: table => new + { + Id = table.Column(nullable: false) + .Annotation("Npgsql:Serial", true), + AttachedFilesString = table.Column(nullable: true), + AttachedGraphicsString = table.Column(nullable: true), + CommandId = table.Column(nullable: true), + Description = table.Column(nullable: true), + Status = table.Column(nullable: true), + Title = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_Estimate", x => x.Id); + table.ForeignKey( + name: "FK_Estimate_BookQuery_CommandId", + column: x => x.CommandId, + principalTable: "BookQuery", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + }); + migrationBuilder.AlterColumn( + name: "posted", + table: "Blog", + nullable: false, + defaultValueSql: "LOCALTIMESTAMP"); + migrationBuilder.AlterColumn( + name: "AuthorId", + table: "Blog", + nullable: true); + migrationBuilder.AddColumn( + name: "EstimateId", + table: "CommandLine", + nullable: true); + migrationBuilder.AddForeignKey( + name: "FK_IdentityRoleClaim_IdentityRole_RoleId", + table: "AspNetRoleClaims", + column: "RoleId", + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserClaim_ApplicationUser_UserId", + table: "AspNetUserClaims", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserLogin_ApplicationUser_UserId", + table: "AspNetUserLogins", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserRole_IdentityRole_RoleId", + table: "AspNetUserRoles", + column: "RoleId", + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserRole_ApplicationUser_UserId", + table: "AspNetUserRoles", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_AccountBalance_ApplicationUser_UserId", + table: "AccountBalance", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_BalanceImpact_AccountBalance_BalanceId", + table: "BalanceImpact", + column: "BalanceId", + principalTable: "AccountBalance", + principalColumn: "UserId", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_CommandLine_Estimate_EstimateId", + table: "CommandLine", + column: "EstimateId", + principalTable: "Estimate", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_BookQuery_ApplicationUser_ClientId", + table: "BookQuery", + column: "ClientId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_BookQuery_PerformerProfile_PerformerId", + table: "BookQuery", + column: "PerformerId", + principalTable: "PerformerProfile", + principalColumn: "PerfomerId", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_CircleMember_Circle_CircleId", + table: "CircleMember", + column: "CircleId", + principalTable: "Circle", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_CircleMember_ApplicationUser_MemberId", + table: "CircleMember", + column: "MemberId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_Contact_ApplicationUser_OwnerId", + table: "Contact", + column: "OwnerId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_Activity_ActivityCode", + table: "PerformerProfile", + column: "ActivityCode", + principalTable: "Activity", + principalColumn: "Code", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_Location_OrganisationAddressId", + table: "PerformerProfile", + column: "OrganisationAddressId", + principalTable: "Location", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_ApplicationUser_PerfomerId", + table: "PerformerProfile", + column: "PerfomerId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey(name: "FK_IdentityRoleClaim_IdentityRole_RoleId", table: "AspNetRoleClaims"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserClaim_ApplicationUser_UserId", table: "AspNetUserClaims"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserLogin_ApplicationUser_UserId", table: "AspNetUserLogins"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole_IdentityRole_RoleId", table: "AspNetUserRoles"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole_ApplicationUser_UserId", table: "AspNetUserRoles"); + migrationBuilder.DropForeignKey(name: "FK_AccountBalance_ApplicationUser_UserId", table: "AccountBalance"); + migrationBuilder.DropForeignKey(name: "FK_BalanceImpact_AccountBalance_BalanceId", table: "BalanceImpact"); + migrationBuilder.DropForeignKey(name: "FK_CommandLine_Estimate_EstimateId", table: "CommandLine"); + migrationBuilder.DropForeignKey(name: "FK_BookQuery_ApplicationUser_ClientId", table: "BookQuery"); + migrationBuilder.DropForeignKey(name: "FK_BookQuery_PerformerProfile_PerformerId", table: "BookQuery"); + migrationBuilder.DropForeignKey(name: "FK_CircleMember_Circle_CircleId", table: "CircleMember"); + migrationBuilder.DropForeignKey(name: "FK_CircleMember_ApplicationUser_MemberId", table: "CircleMember"); + migrationBuilder.DropForeignKey(name: "FK_Contact_ApplicationUser_OwnerId", table: "Contact"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Activity_ActivityCode", table: "PerformerProfile"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Location_OrganisationAddressId", table: "PerformerProfile"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_ApplicationUser_PerfomerId", table: "PerformerProfile"); + migrationBuilder.DropColumn(name: "EstimateId", table: "CommandLine"); + migrationBuilder.DropTable("Estimate"); + migrationBuilder.CreateTable( + name: "RDVEstimate", + columns: table => new + { + Id = table.Column(nullable: false) + .Annotation("Npgsql:Serial", true), + AttachedFilesString = table.Column(nullable: true), + AttachedGraphicsString = table.Column(nullable: true), + CommandId = table.Column(nullable: true), + Description = table.Column(nullable: true), + Status = table.Column(nullable: true), + Title = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_RDVEstimate", x => x.Id); + table.ForeignKey( + name: "FK_RDVEstimate_BookQuery_CommandId", + column: x => x.CommandId, + principalTable: "BookQuery", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + }); + migrationBuilder.AlterColumn( + name: "posted", + table: "Blog", + nullable: false); + migrationBuilder.AlterColumn( + name: "AuthorId", + table: "Blog", + nullable: false); + migrationBuilder.AddColumn( + name: "RDVEstimateId", + table: "CommandLine", + nullable: true); + migrationBuilder.AddForeignKey( + name: "FK_IdentityRoleClaim_IdentityRole_RoleId", + table: "AspNetRoleClaims", + column: "RoleId", + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserClaim_ApplicationUser_UserId", + table: "AspNetUserClaims", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserLogin_ApplicationUser_UserId", + table: "AspNetUserLogins", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserRole_IdentityRole_RoleId", + table: "AspNetUserRoles", + column: "RoleId", + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserRole_ApplicationUser_UserId", + table: "AspNetUserRoles", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_AccountBalance_ApplicationUser_UserId", + table: "AccountBalance", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_BalanceImpact_AccountBalance_BalanceId", + table: "BalanceImpact", + column: "BalanceId", + principalTable: "AccountBalance", + principalColumn: "UserId", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_CommandLine_RDVEstimate_RDVEstimateId", + table: "CommandLine", + column: "RDVEstimateId", + principalTable: "RDVEstimate", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_BookQuery_ApplicationUser_ClientId", + table: "BookQuery", + column: "ClientId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_BookQuery_PerformerProfile_PerformerId", + table: "BookQuery", + column: "PerformerId", + principalTable: "PerformerProfile", + principalColumn: "PerfomerId", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_CircleMember_Circle_CircleId", + table: "CircleMember", + column: "CircleId", + principalTable: "Circle", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_CircleMember_ApplicationUser_MemberId", + table: "CircleMember", + column: "MemberId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_Contact_ApplicationUser_OwnerId", + table: "Contact", + column: "OwnerId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_Activity_ActivityCode", + table: "PerformerProfile", + column: "ActivityCode", + principalTable: "Activity", + principalColumn: "Code", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_Location_OrganisationAddressId", + table: "PerformerProfile", + column: "OrganisationAddressId", + principalTable: "Location", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_ApplicationUser_PerfomerId", + table: "PerformerProfile", + column: "PerfomerId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + } + } +} diff --git a/Yavsc/Migrations/20160726131331_performerIdTypo.Designer.cs b/Yavsc/Migrations/20160726131331_performerIdTypo.Designer.cs new file mode 100644 index 00000000..b4edd63b --- /dev/null +++ b/Yavsc/Migrations/20160726131331_performerIdTypo.Designer.cs @@ -0,0 +1,664 @@ +using System; +using Microsoft.Data.Entity; +using Microsoft.Data.Entity.Infrastructure; +using Microsoft.Data.Entity.Migrations; +using Yavsc.Models; + +namespace Yavsc.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + [Migration("20160726131331_performerIdTypo")] + partial class performerIdTypo + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { + modelBuilder + .HasAnnotation("ProductVersion", "7.0.0-rc1-16348"); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRole", b => + { + b.Property("Id"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken(); + + b.Property("Name") + .HasAnnotation("MaxLength", 256); + + b.Property("NormalizedName") + .HasAnnotation("MaxLength", 256); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .HasAnnotation("Relational:Name", "RoleNameIndex"); + + b.HasAnnotation("Relational:TableName", "AspNetRoles"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClaimType"); + + b.Property("ClaimValue"); + + b.Property("RoleId") + .IsRequired(); + + b.HasKey("Id"); + + b.HasAnnotation("Relational:TableName", "AspNetRoleClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClaimType"); + + b.Property("ClaimValue"); + + b.Property("UserId") + .IsRequired(); + + b.HasKey("Id"); + + b.HasAnnotation("Relational:TableName", "AspNetUserClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserLogin", b => + { + b.Property("LoginProvider"); + + b.Property("ProviderKey"); + + b.Property("ProviderDisplayName"); + + b.Property("UserId") + .IsRequired(); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasAnnotation("Relational:TableName", "AspNetUserLogins"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole", b => + { + b.Property("UserId"); + + b.Property("RoleId"); + + b.HasKey("UserId", "RoleId"); + + b.HasAnnotation("Relational:TableName", "AspNetUserRoles"); + }); + + modelBuilder.Entity("Yavsc.Location", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Address") + .IsRequired(); + + b.Property("Latitude"); + + b.Property("Longitude"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.AccountBalance", b => + { + b.Property("UserId"); + + b.Property("ContactCredits"); + + b.Property("Credits"); + + b.HasKey("UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Activity", b => + { + b.Property("Code") + .HasAnnotation("MaxLength", 512); + + b.Property("ActorDenomination"); + + b.Property("Description"); + + b.Property("ModeratorGroupName"); + + b.Property("Name") + .IsRequired() + .HasAnnotation("MaxLength", 512); + + b.Property("Photo"); + + b.HasKey("Code"); + }); + + modelBuilder.Entity("Yavsc.Models.ApplicationUser", b => + { + b.Property("Id"); + + b.Property("AccessFailedCount"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken(); + + b.Property("DedicatedGoogleCalendar"); + + b.Property("Email") + .HasAnnotation("MaxLength", 256); + + b.Property("EmailConfirmed"); + + b.Property("LockoutEnabled"); + + b.Property("LockoutEnd"); + + b.Property("NormalizedEmail") + .HasAnnotation("MaxLength", 256); + + b.Property("NormalizedUserName") + .HasAnnotation("MaxLength", 256); + + b.Property("PasswordHash"); + + b.Property("PhoneNumber"); + + b.Property("PhoneNumberConfirmed"); + + b.Property("PostalAddressId"); + + b.Property("SecurityStamp"); + + b.Property("TwoFactorEnabled"); + + b.Property("UserName") + .HasAnnotation("MaxLength", 256); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasAnnotation("Relational:Name", "EmailIndex"); + + b.HasIndex("NormalizedUserName") + .HasAnnotation("Relational:Name", "UserNameIndex"); + + b.HasAnnotation("Relational:TableName", "AspNetUsers"); + }); + + modelBuilder.Entity("Yavsc.Models.Auth.Client", b => + { + b.Property("Id"); + + b.Property("Active"); + + b.Property("DisplayName"); + + b.Property("LogoutRedirectUri") + .HasAnnotation("MaxLength", 100); + + b.Property("RedirectUri"); + + b.Property("RefreshTokenLifeTime"); + + b.Property("Secret"); + + b.Property("Type"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Auth.RefreshToken", b => + { + b.Property("Id"); + + b.Property("ClientId") + .IsRequired() + .HasAnnotation("MaxLength", 50); + + b.Property("ExpiresUtc"); + + b.Property("IssuedUtc"); + + b.Property("ProtectedTicket") + .IsRequired(); + + b.Property("Subject") + .IsRequired() + .HasAnnotation("MaxLength", 50); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.BalanceImpact", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BalanceId") + .IsRequired(); + + b.Property("ExecDate"); + + b.Property("Impact"); + + b.Property("Reason") + .IsRequired(); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.CommandLine", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ArticleId"); + + b.Property("BookQueryId"); + + b.Property("Comment"); + + b.Property("Count"); + + b.Property("EstimateId"); + + b.Property("UnitaryCost"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.Estimate", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AttachedFilesString"); + + b.Property("AttachedGraphicsString"); + + b.Property("CommandId"); + + b.Property("Description"); + + b.Property("Status"); + + b.Property("Title"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Blog", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AuthorId"); + + b.Property("bcontent"); + + b.Property("modified"); + + b.Property("photo"); + + b.Property("posted") + .ValueGeneratedOnAdd() + .HasAnnotation("Relational:GeneratedValueSql", "LOCALTIMESTAMP"); + + b.Property("rate"); + + b.Property("title"); + + b.Property("visible"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Booking.BookQuery", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClientId") + .IsRequired(); + + b.Property("CreationDate") + .ValueGeneratedOnAdd() + .HasAnnotation("Relational:GeneratedValueSql", "LOCALTIMESTAMP"); + + b.Property("EventDate"); + + b.Property("Lag"); + + b.Property("LocationId"); + + b.Property("PerformerId") + .IsRequired(); + + b.Property("Previsional"); + + b.Property("ValidationDate"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Circle", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Name"); + + b.Property("OwnerId"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.CircleMember", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("CircleId") + .IsRequired(); + + b.Property("MemberId") + .IsRequired(); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Contact", b => + { + b.Property("OwnerId"); + + b.Property("UserId"); + + b.HasKey("OwnerId", "UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Identity.GoogleCloudMobileDeclaration", b => + { + b.Property("DeviceId"); + + b.Property("DeclarationDate") + .ValueGeneratedOnAdd() + .HasAnnotation("Relational:GeneratedValueSql", "LOCALTIMESTAMP"); + + b.Property("DeviceOwnerId"); + + b.Property("GCMRegistrationId") + .IsRequired(); + + b.Property("Model"); + + b.Property("Platform"); + + b.Property("Version"); + + b.HasKey("DeviceId"); + }); + + modelBuilder.Entity("Yavsc.Models.Market.BaseProduct", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Description"); + + b.Property("Name"); + + b.Property("Public"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Market.Service", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Billing"); + + b.Property("ContextId"); + + b.Property("Description"); + + b.Property("Name"); + + b.Property("Pricing"); + + b.Property("Public"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.OAuth.OAuth2Tokens", b => + { + b.Property("UserId"); + + b.Property("AccessToken"); + + b.Property("Expiration"); + + b.Property("ExpiresIn"); + + b.Property("RefreshToken"); + + b.Property("TokenType"); + + b.HasKey("UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Skill", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Name"); + + b.Property("Rate"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.PerformerProfile", b => + { + b.Property("PerformerId"); + + b.Property("AcceptGeoLocalisation"); + + b.Property("AcceptNotifications"); + + b.Property("AcceptPublicContact"); + + b.Property("Active"); + + b.Property("ActivityCode") + .IsRequired(); + + b.Property("MaxDailyCost"); + + b.Property("MinDailyCost"); + + b.Property("OfferId"); + + b.Property("OrganisationAddressId"); + + b.Property("Rate"); + + b.Property("SIREN") + .IsRequired() + .HasAnnotation("MaxLength", 14); + + b.Property("WebSite"); + + b.HasKey("PerformerId"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRoleClaim", b => + { + b.HasOne("Microsoft.AspNet.Identity.EntityFramework.IdentityRole") + .WithMany() + .HasForeignKey("RoleId"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserClaim", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserLogin", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole", b => + { + b.HasOne("Microsoft.AspNet.Identity.EntityFramework.IdentityRole") + .WithMany() + .HasForeignKey("RoleId"); + + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.AccountBalance", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithOne() + .HasForeignKey("Yavsc.Models.AccountBalance", "UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.ApplicationUser", b => + { + b.HasOne("Yavsc.Location") + .WithMany() + .HasForeignKey("PostalAddressId"); + }); + + modelBuilder.Entity("Yavsc.Models.BalanceImpact", b => + { + b.HasOne("Yavsc.Models.AccountBalance") + .WithMany() + .HasForeignKey("BalanceId"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.CommandLine", b => + { + b.HasOne("Yavsc.Models.Market.BaseProduct") + .WithMany() + .HasForeignKey("ArticleId"); + + b.HasOne("Yavsc.Models.Booking.BookQuery") + .WithMany() + .HasForeignKey("BookQueryId"); + + b.HasOne("Yavsc.Models.Billing.Estimate") + .WithMany() + .HasForeignKey("EstimateId"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.Estimate", b => + { + b.HasOne("Yavsc.Models.Booking.BookQuery") + .WithMany() + .HasForeignKey("CommandId"); + }); + + modelBuilder.Entity("Yavsc.Models.Blog", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("AuthorId"); + }); + + modelBuilder.Entity("Yavsc.Models.Booking.BookQuery", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("ClientId"); + + b.HasOne("Yavsc.Location") + .WithMany() + .HasForeignKey("LocationId"); + + b.HasOne("Yavsc.Models.Workflow.PerformerProfile") + .WithMany() + .HasForeignKey("PerformerId"); + }); + + modelBuilder.Entity("Yavsc.Models.Circle", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("OwnerId"); + }); + + modelBuilder.Entity("Yavsc.Models.CircleMember", b => + { + b.HasOne("Yavsc.Models.Circle") + .WithMany() + .HasForeignKey("CircleId"); + + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("MemberId"); + }); + + modelBuilder.Entity("Yavsc.Models.Contact", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("OwnerId"); + }); + + modelBuilder.Entity("Yavsc.Models.Identity.GoogleCloudMobileDeclaration", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("DeviceOwnerId"); + }); + + modelBuilder.Entity("Yavsc.Models.Market.Service", b => + { + b.HasOne("Yavsc.Models.Activity") + .WithMany() + .HasForeignKey("ContextId"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.PerformerProfile", b => + { + b.HasOne("Yavsc.Models.Activity") + .WithMany() + .HasForeignKey("ActivityCode"); + + b.HasOne("Yavsc.Models.Market.Service") + .WithMany() + .HasForeignKey("OfferId"); + + b.HasOne("Yavsc.Location") + .WithMany() + .HasForeignKey("OrganisationAddressId"); + + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("PerformerId"); + }); + } + } +} diff --git a/Yavsc/Migrations/20160726131331_performerIdTypo.cs b/Yavsc/Migrations/20160726131331_performerIdTypo.cs new file mode 100644 index 00000000..a9a5ef2e --- /dev/null +++ b/Yavsc/Migrations/20160726131331_performerIdTypo.cs @@ -0,0 +1,272 @@ +using Microsoft.Data.Entity.Migrations; + +namespace Yavsc.Migrations +{ + public partial class performerIdTypo : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey(name: "FK_IdentityRoleClaim_IdentityRole_RoleId", table: "AspNetRoleClaims"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserClaim_ApplicationUser_UserId", table: "AspNetUserClaims"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserLogin_ApplicationUser_UserId", table: "AspNetUserLogins"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole_IdentityRole_RoleId", table: "AspNetUserRoles"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole_ApplicationUser_UserId", table: "AspNetUserRoles"); + migrationBuilder.DropForeignKey(name: "FK_AccountBalance_ApplicationUser_UserId", table: "AccountBalance"); + migrationBuilder.DropForeignKey(name: "FK_BalanceImpact_AccountBalance_BalanceId", table: "BalanceImpact"); + migrationBuilder.DropForeignKey(name: "FK_BookQuery_ApplicationUser_ClientId", table: "BookQuery"); + migrationBuilder.DropForeignKey(name: "FK_BookQuery_PerformerProfile_PerformerId", table: "BookQuery"); + migrationBuilder.DropForeignKey(name: "FK_CircleMember_Circle_CircleId", table: "CircleMember"); + migrationBuilder.DropForeignKey(name: "FK_CircleMember_ApplicationUser_MemberId", table: "CircleMember"); + migrationBuilder.DropForeignKey(name: "FK_Contact_ApplicationUser_OwnerId", table: "Contact"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Activity_ActivityCode", table: "PerformerProfile"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Location_OrganisationAddressId", table: "PerformerProfile"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_ApplicationUser_PerfomerId", table: "PerformerProfile"); + migrationBuilder.DropPrimaryKey(name: "PK_PerformerProfile", table: "PerformerProfile"); + migrationBuilder.RenameColumn(name: "PerfomerId", table: "PerformerProfile",newName: "PerformerId"); + migrationBuilder.AddPrimaryKey( + name: "PK_PerformerProfile", + table: "PerformerProfile", + column: "PerformerId"); + migrationBuilder.AddForeignKey( + name: "FK_IdentityRoleClaim_IdentityRole_RoleId", + table: "AspNetRoleClaims", + column: "RoleId", + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserClaim_ApplicationUser_UserId", + table: "AspNetUserClaims", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserLogin_ApplicationUser_UserId", + table: "AspNetUserLogins", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserRole_IdentityRole_RoleId", + table: "AspNetUserRoles", + column: "RoleId", + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserRole_ApplicationUser_UserId", + table: "AspNetUserRoles", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_AccountBalance_ApplicationUser_UserId", + table: "AccountBalance", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_BalanceImpact_AccountBalance_BalanceId", + table: "BalanceImpact", + column: "BalanceId", + principalTable: "AccountBalance", + principalColumn: "UserId", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_BookQuery_ApplicationUser_ClientId", + table: "BookQuery", + column: "ClientId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_BookQuery_PerformerProfile_PerformerId", + table: "BookQuery", + column: "PerformerId", + principalTable: "PerformerProfile", + principalColumn: "PerformerId", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_CircleMember_Circle_CircleId", + table: "CircleMember", + column: "CircleId", + principalTable: "Circle", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_CircleMember_ApplicationUser_MemberId", + table: "CircleMember", + column: "MemberId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_Contact_ApplicationUser_OwnerId", + table: "Contact", + column: "OwnerId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_Activity_ActivityCode", + table: "PerformerProfile", + column: "ActivityCode", + principalTable: "Activity", + principalColumn: "Code", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_Location_OrganisationAddressId", + table: "PerformerProfile", + column: "OrganisationAddressId", + principalTable: "Location", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_ApplicationUser_PerformerId", + table: "PerformerProfile", + column: "PerformerId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey(name: "FK_IdentityRoleClaim_IdentityRole_RoleId", table: "AspNetRoleClaims"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserClaim_ApplicationUser_UserId", table: "AspNetUserClaims"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserLogin_ApplicationUser_UserId", table: "AspNetUserLogins"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole_IdentityRole_RoleId", table: "AspNetUserRoles"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole_ApplicationUser_UserId", table: "AspNetUserRoles"); + migrationBuilder.DropForeignKey(name: "FK_AccountBalance_ApplicationUser_UserId", table: "AccountBalance"); + migrationBuilder.DropForeignKey(name: "FK_BalanceImpact_AccountBalance_BalanceId", table: "BalanceImpact"); + migrationBuilder.DropForeignKey(name: "FK_BookQuery_ApplicationUser_ClientId", table: "BookQuery"); + migrationBuilder.DropForeignKey(name: "FK_BookQuery_PerformerProfile_PerformerId", table: "BookQuery"); + migrationBuilder.DropForeignKey(name: "FK_CircleMember_Circle_CircleId", table: "CircleMember"); + migrationBuilder.DropForeignKey(name: "FK_CircleMember_ApplicationUser_MemberId", table: "CircleMember"); + migrationBuilder.DropForeignKey(name: "FK_Contact_ApplicationUser_OwnerId", table: "Contact"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Activity_ActivityCode", table: "PerformerProfile"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Location_OrganisationAddressId", table: "PerformerProfile"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_ApplicationUser_PerformerId", table: "PerformerProfile"); + migrationBuilder.DropPrimaryKey(name: "PK_PerformerProfile", table: "PerformerProfile"); + migrationBuilder.DropColumn(name: "PerformerId", table: "PerformerProfile"); + migrationBuilder.AddColumn( + name: "PerfomerId", + table: "PerformerProfile", + nullable: false, + defaultValue: ""); + migrationBuilder.AddPrimaryKey( + name: "PK_PerformerProfile", + table: "PerformerProfile", + column: "PerfomerId"); + migrationBuilder.AddForeignKey( + name: "FK_IdentityRoleClaim_IdentityRole_RoleId", + table: "AspNetRoleClaims", + column: "RoleId", + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserClaim_ApplicationUser_UserId", + table: "AspNetUserClaims", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserLogin_ApplicationUser_UserId", + table: "AspNetUserLogins", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserRole_IdentityRole_RoleId", + table: "AspNetUserRoles", + column: "RoleId", + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserRole_ApplicationUser_UserId", + table: "AspNetUserRoles", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_AccountBalance_ApplicationUser_UserId", + table: "AccountBalance", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_BalanceImpact_AccountBalance_BalanceId", + table: "BalanceImpact", + column: "BalanceId", + principalTable: "AccountBalance", + principalColumn: "UserId", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_BookQuery_ApplicationUser_ClientId", + table: "BookQuery", + column: "ClientId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_BookQuery_PerformerProfile_PerformerId", + table: "BookQuery", + column: "PerformerId", + principalTable: "PerformerProfile", + principalColumn: "PerfomerId", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_CircleMember_Circle_CircleId", + table: "CircleMember", + column: "CircleId", + principalTable: "Circle", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_CircleMember_ApplicationUser_MemberId", + table: "CircleMember", + column: "MemberId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_Contact_ApplicationUser_OwnerId", + table: "Contact", + column: "OwnerId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_Activity_ActivityCode", + table: "PerformerProfile", + column: "ActivityCode", + principalTable: "Activity", + principalColumn: "Code", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_Location_OrganisationAddressId", + table: "PerformerProfile", + column: "OrganisationAddressId", + principalTable: "Location", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_ApplicationUser_PerfomerId", + table: "PerformerProfile", + column: "PerfomerId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + } + } +} diff --git a/Yavsc/Migrations/20160726133002_otherOrtho.Designer.cs b/Yavsc/Migrations/20160726133002_otherOrtho.Designer.cs new file mode 100644 index 00000000..bab398ca --- /dev/null +++ b/Yavsc/Migrations/20160726133002_otherOrtho.Designer.cs @@ -0,0 +1,664 @@ +using System; +using Microsoft.Data.Entity; +using Microsoft.Data.Entity.Infrastructure; +using Microsoft.Data.Entity.Migrations; +using Yavsc.Models; + +namespace Yavsc.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + [Migration("20160726133002_otherOrtho")] + partial class otherOrtho + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { + modelBuilder + .HasAnnotation("ProductVersion", "7.0.0-rc1-16348"); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRole", b => + { + b.Property("Id"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken(); + + b.Property("Name") + .HasAnnotation("MaxLength", 256); + + b.Property("NormalizedName") + .HasAnnotation("MaxLength", 256); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .HasAnnotation("Relational:Name", "RoleNameIndex"); + + b.HasAnnotation("Relational:TableName", "AspNetRoles"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClaimType"); + + b.Property("ClaimValue"); + + b.Property("RoleId") + .IsRequired(); + + b.HasKey("Id"); + + b.HasAnnotation("Relational:TableName", "AspNetRoleClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClaimType"); + + b.Property("ClaimValue"); + + b.Property("UserId") + .IsRequired(); + + b.HasKey("Id"); + + b.HasAnnotation("Relational:TableName", "AspNetUserClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserLogin", b => + { + b.Property("LoginProvider"); + + b.Property("ProviderKey"); + + b.Property("ProviderDisplayName"); + + b.Property("UserId") + .IsRequired(); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasAnnotation("Relational:TableName", "AspNetUserLogins"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole", b => + { + b.Property("UserId"); + + b.Property("RoleId"); + + b.HasKey("UserId", "RoleId"); + + b.HasAnnotation("Relational:TableName", "AspNetUserRoles"); + }); + + modelBuilder.Entity("Yavsc.Location", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Address") + .IsRequired(); + + b.Property("Latitude"); + + b.Property("Longitude"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.AccountBalance", b => + { + b.Property("UserId"); + + b.Property("ContactCredits"); + + b.Property("Credits"); + + b.HasKey("UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Activity", b => + { + b.Property("Code") + .HasAnnotation("MaxLength", 512); + + b.Property("ActorDenomination"); + + b.Property("Description"); + + b.Property("ModeratorGroupName"); + + b.Property("Name") + .IsRequired() + .HasAnnotation("MaxLength", 512); + + b.Property("Photo"); + + b.HasKey("Code"); + }); + + modelBuilder.Entity("Yavsc.Models.ApplicationUser", b => + { + b.Property("Id"); + + b.Property("AccessFailedCount"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken(); + + b.Property("DedicatedGoogleCalendar"); + + b.Property("Email") + .HasAnnotation("MaxLength", 256); + + b.Property("EmailConfirmed"); + + b.Property("LockoutEnabled"); + + b.Property("LockoutEnd"); + + b.Property("NormalizedEmail") + .HasAnnotation("MaxLength", 256); + + b.Property("NormalizedUserName") + .HasAnnotation("MaxLength", 256); + + b.Property("PasswordHash"); + + b.Property("PhoneNumber"); + + b.Property("PhoneNumberConfirmed"); + + b.Property("PostalAddressId"); + + b.Property("SecurityStamp"); + + b.Property("TwoFactorEnabled"); + + b.Property("UserName") + .HasAnnotation("MaxLength", 256); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasAnnotation("Relational:Name", "EmailIndex"); + + b.HasIndex("NormalizedUserName") + .HasAnnotation("Relational:Name", "UserNameIndex"); + + b.HasAnnotation("Relational:TableName", "AspNetUsers"); + }); + + modelBuilder.Entity("Yavsc.Models.Auth.Client", b => + { + b.Property("Id"); + + b.Property("Active"); + + b.Property("DisplayName"); + + b.Property("LogoutRedirectUri") + .HasAnnotation("MaxLength", 100); + + b.Property("RedirectUri"); + + b.Property("RefreshTokenLifeTime"); + + b.Property("Secret"); + + b.Property("Type"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Auth.RefreshToken", b => + { + b.Property("Id"); + + b.Property("ClientId") + .IsRequired() + .HasAnnotation("MaxLength", 50); + + b.Property("ExpiresUtc"); + + b.Property("IssuedUtc"); + + b.Property("ProtectedTicket") + .IsRequired(); + + b.Property("Subject") + .IsRequired() + .HasAnnotation("MaxLength", 50); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.BalanceImpact", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BalanceId") + .IsRequired(); + + b.Property("ExecDate"); + + b.Property("Impact"); + + b.Property("Reason") + .IsRequired(); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.CommandLine", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ArticleId"); + + b.Property("BookQueryId"); + + b.Property("Comment"); + + b.Property("Count"); + + b.Property("EstimateId"); + + b.Property("UnitaryCost"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.Estimate", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AttachedFilesString"); + + b.Property("AttachedGraphicsString"); + + b.Property("CommandId"); + + b.Property("Description"); + + b.Property("Status"); + + b.Property("Title"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Blog", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AuthorId"); + + b.Property("bcontent"); + + b.Property("modified"); + + b.Property("photo"); + + b.Property("posted") + .ValueGeneratedOnAdd() + .HasAnnotation("Relational:GeneratedValueSql", "LOCALTIMESTAMP"); + + b.Property("rate"); + + b.Property("title"); + + b.Property("visible"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Booking.BookQuery", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClientId") + .IsRequired(); + + b.Property("CreationDate") + .ValueGeneratedOnAdd() + .HasAnnotation("Relational:GeneratedValueSql", "LOCALTIMESTAMP"); + + b.Property("EventDate"); + + b.Property("Lag"); + + b.Property("LocationId"); + + b.Property("PerformerId") + .IsRequired(); + + b.Property("Previsional"); + + b.Property("ValidationDate"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Circle", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Name"); + + b.Property("OwnerId"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.CircleMember", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("CircleId") + .IsRequired(); + + b.Property("MemberId") + .IsRequired(); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Contact", b => + { + b.Property("OwnerId"); + + b.Property("UserId"); + + b.HasKey("OwnerId", "UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Identity.GoogleCloudMobileDeclaration", b => + { + b.Property("DeviceId"); + + b.Property("DeclarationDate") + .ValueGeneratedOnAdd() + .HasAnnotation("Relational:GeneratedValueSql", "LOCALTIMESTAMP"); + + b.Property("DeviceOwnerId"); + + b.Property("GCMRegistrationId") + .IsRequired(); + + b.Property("Model"); + + b.Property("Platform"); + + b.Property("Version"); + + b.HasKey("DeviceId"); + }); + + modelBuilder.Entity("Yavsc.Models.Market.BaseProduct", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Description"); + + b.Property("Name"); + + b.Property("Public"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Market.Service", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Billing"); + + b.Property("ContextId"); + + b.Property("Description"); + + b.Property("Name"); + + b.Property("Pricing"); + + b.Property("Public"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.OAuth.OAuth2Tokens", b => + { + b.Property("UserId"); + + b.Property("AccessToken"); + + b.Property("Expiration"); + + b.Property("ExpiresIn"); + + b.Property("RefreshToken"); + + b.Property("TokenType"); + + b.HasKey("UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Skill", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Name"); + + b.Property("Rate"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.PerformerProfile", b => + { + b.Property("PerformerId"); + + b.Property("AcceptGeoLocalization"); + + b.Property("AcceptNotifications"); + + b.Property("AcceptPublicContact"); + + b.Property("Active"); + + b.Property("ActivityCode") + .IsRequired(); + + b.Property("MaxDailyCost"); + + b.Property("MinDailyCost"); + + b.Property("OfferId"); + + b.Property("OrganizationAddressId"); + + b.Property("Rate"); + + b.Property("SIREN") + .IsRequired() + .HasAnnotation("MaxLength", 14); + + b.Property("WebSite"); + + b.HasKey("PerformerId"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRoleClaim", b => + { + b.HasOne("Microsoft.AspNet.Identity.EntityFramework.IdentityRole") + .WithMany() + .HasForeignKey("RoleId"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserClaim", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserLogin", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole", b => + { + b.HasOne("Microsoft.AspNet.Identity.EntityFramework.IdentityRole") + .WithMany() + .HasForeignKey("RoleId"); + + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.AccountBalance", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithOne() + .HasForeignKey("Yavsc.Models.AccountBalance", "UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.ApplicationUser", b => + { + b.HasOne("Yavsc.Location") + .WithMany() + .HasForeignKey("PostalAddressId"); + }); + + modelBuilder.Entity("Yavsc.Models.BalanceImpact", b => + { + b.HasOne("Yavsc.Models.AccountBalance") + .WithMany() + .HasForeignKey("BalanceId"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.CommandLine", b => + { + b.HasOne("Yavsc.Models.Market.BaseProduct") + .WithMany() + .HasForeignKey("ArticleId"); + + b.HasOne("Yavsc.Models.Booking.BookQuery") + .WithMany() + .HasForeignKey("BookQueryId"); + + b.HasOne("Yavsc.Models.Billing.Estimate") + .WithMany() + .HasForeignKey("EstimateId"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.Estimate", b => + { + b.HasOne("Yavsc.Models.Booking.BookQuery") + .WithMany() + .HasForeignKey("CommandId"); + }); + + modelBuilder.Entity("Yavsc.Models.Blog", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("AuthorId"); + }); + + modelBuilder.Entity("Yavsc.Models.Booking.BookQuery", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("ClientId"); + + b.HasOne("Yavsc.Location") + .WithMany() + .HasForeignKey("LocationId"); + + b.HasOne("Yavsc.Models.Workflow.PerformerProfile") + .WithMany() + .HasForeignKey("PerformerId"); + }); + + modelBuilder.Entity("Yavsc.Models.Circle", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("OwnerId"); + }); + + modelBuilder.Entity("Yavsc.Models.CircleMember", b => + { + b.HasOne("Yavsc.Models.Circle") + .WithMany() + .HasForeignKey("CircleId"); + + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("MemberId"); + }); + + modelBuilder.Entity("Yavsc.Models.Contact", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("OwnerId"); + }); + + modelBuilder.Entity("Yavsc.Models.Identity.GoogleCloudMobileDeclaration", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("DeviceOwnerId"); + }); + + modelBuilder.Entity("Yavsc.Models.Market.Service", b => + { + b.HasOne("Yavsc.Models.Activity") + .WithMany() + .HasForeignKey("ContextId"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.PerformerProfile", b => + { + b.HasOne("Yavsc.Models.Activity") + .WithMany() + .HasForeignKey("ActivityCode"); + + b.HasOne("Yavsc.Models.Market.Service") + .WithMany() + .HasForeignKey("OfferId"); + + b.HasOne("Yavsc.Location") + .WithMany() + .HasForeignKey("OrganizationAddressId"); + + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("PerformerId"); + }); + } + } +} diff --git a/Yavsc/Migrations/20160726133002_otherOrtho.cs b/Yavsc/Migrations/20160726133002_otherOrtho.cs new file mode 100644 index 00000000..32ba37ae --- /dev/null +++ b/Yavsc/Migrations/20160726133002_otherOrtho.cs @@ -0,0 +1,271 @@ +using Microsoft.Data.Entity.Migrations; + +namespace Yavsc.Migrations +{ + public partial class otherOrtho : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey(name: "FK_IdentityRoleClaim_IdentityRole_RoleId", table: "AspNetRoleClaims"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserClaim_ApplicationUser_UserId", table: "AspNetUserClaims"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserLogin_ApplicationUser_UserId", table: "AspNetUserLogins"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole_IdentityRole_RoleId", table: "AspNetUserRoles"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole_ApplicationUser_UserId", table: "AspNetUserRoles"); + migrationBuilder.DropForeignKey(name: "FK_AccountBalance_ApplicationUser_UserId", table: "AccountBalance"); + migrationBuilder.DropForeignKey(name: "FK_BalanceImpact_AccountBalance_BalanceId", table: "BalanceImpact"); + migrationBuilder.DropForeignKey(name: "FK_BookQuery_ApplicationUser_ClientId", table: "BookQuery"); + migrationBuilder.DropForeignKey(name: "FK_BookQuery_PerformerProfile_PerformerId", table: "BookQuery"); + migrationBuilder.DropForeignKey(name: "FK_CircleMember_Circle_CircleId", table: "CircleMember"); + migrationBuilder.DropForeignKey(name: "FK_CircleMember_ApplicationUser_MemberId", table: "CircleMember"); + migrationBuilder.DropForeignKey(name: "FK_Contact_ApplicationUser_OwnerId", table: "Contact"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Activity_ActivityCode", table: "PerformerProfile"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Location_OrganisationAddressId", table: "PerformerProfile"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_ApplicationUser_PerformerId", table: "PerformerProfile"); + + migrationBuilder.RenameColumn(name:"AcceptGeoLocalisation",table:"PerformerProfile",newName:"AcceptGeoLocalization"); + migrationBuilder.RenameColumn(name:"OrganisationAddressId",table:"PerformerProfile",newName:"OrganizationAddressId"); + + migrationBuilder.AddForeignKey( + name: "FK_IdentityRoleClaim_IdentityRole_RoleId", + table: "AspNetRoleClaims", + column: "RoleId", + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserClaim_ApplicationUser_UserId", + table: "AspNetUserClaims", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserLogin_ApplicationUser_UserId", + table: "AspNetUserLogins", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserRole_IdentityRole_RoleId", + table: "AspNetUserRoles", + column: "RoleId", + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserRole_ApplicationUser_UserId", + table: "AspNetUserRoles", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_AccountBalance_ApplicationUser_UserId", + table: "AccountBalance", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_BalanceImpact_AccountBalance_BalanceId", + table: "BalanceImpact", + column: "BalanceId", + principalTable: "AccountBalance", + principalColumn: "UserId", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_BookQuery_ApplicationUser_ClientId", + table: "BookQuery", + column: "ClientId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_BookQuery_PerformerProfile_PerformerId", + table: "BookQuery", + column: "PerformerId", + principalTable: "PerformerProfile", + principalColumn: "PerformerId", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_CircleMember_Circle_CircleId", + table: "CircleMember", + column: "CircleId", + principalTable: "Circle", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_CircleMember_ApplicationUser_MemberId", + table: "CircleMember", + column: "MemberId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_Contact_ApplicationUser_OwnerId", + table: "Contact", + column: "OwnerId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_Activity_ActivityCode", + table: "PerformerProfile", + column: "ActivityCode", + principalTable: "Activity", + principalColumn: "Code", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_Location_OrganizationAddressId", + table: "PerformerProfile", + column: "OrganizationAddressId", + principalTable: "Location", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_ApplicationUser_PerformerId", + table: "PerformerProfile", + column: "PerformerId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey(name: "FK_IdentityRoleClaim_IdentityRole_RoleId", table: "AspNetRoleClaims"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserClaim_ApplicationUser_UserId", table: "AspNetUserClaims"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserLogin_ApplicationUser_UserId", table: "AspNetUserLogins"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole_IdentityRole_RoleId", table: "AspNetUserRoles"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole_ApplicationUser_UserId", table: "AspNetUserRoles"); + migrationBuilder.DropForeignKey(name: "FK_AccountBalance_ApplicationUser_UserId", table: "AccountBalance"); + migrationBuilder.DropForeignKey(name: "FK_BalanceImpact_AccountBalance_BalanceId", table: "BalanceImpact"); + migrationBuilder.DropForeignKey(name: "FK_BookQuery_ApplicationUser_ClientId", table: "BookQuery"); + migrationBuilder.DropForeignKey(name: "FK_BookQuery_PerformerProfile_PerformerId", table: "BookQuery"); + migrationBuilder.DropForeignKey(name: "FK_CircleMember_Circle_CircleId", table: "CircleMember"); + migrationBuilder.DropForeignKey(name: "FK_CircleMember_ApplicationUser_MemberId", table: "CircleMember"); + migrationBuilder.DropForeignKey(name: "FK_Contact_ApplicationUser_OwnerId", table: "Contact"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Activity_ActivityCode", table: "PerformerProfile"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Location_OrganizationAddressId", table: "PerformerProfile"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_ApplicationUser_PerformerId", table: "PerformerProfile"); + migrationBuilder.DropColumn(name: "AcceptGeoLocalization", table: "PerformerProfile"); + migrationBuilder.DropColumn(name: "OrganizationAddressId", table: "PerformerProfile"); + migrationBuilder.AddColumn( + name: "AcceptGeoLocalisation", + table: "PerformerProfile", + nullable: false, + defaultValue: false); + migrationBuilder.AddColumn( + name: "OrganisationAddressId", + table: "PerformerProfile", + nullable: false, + defaultValue: 0L); + migrationBuilder.AddForeignKey( + name: "FK_IdentityRoleClaim_IdentityRole_RoleId", + table: "AspNetRoleClaims", + column: "RoleId", + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserClaim_ApplicationUser_UserId", + table: "AspNetUserClaims", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserLogin_ApplicationUser_UserId", + table: "AspNetUserLogins", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserRole_IdentityRole_RoleId", + table: "AspNetUserRoles", + column: "RoleId", + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserRole_ApplicationUser_UserId", + table: "AspNetUserRoles", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_AccountBalance_ApplicationUser_UserId", + table: "AccountBalance", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_BalanceImpact_AccountBalance_BalanceId", + table: "BalanceImpact", + column: "BalanceId", + principalTable: "AccountBalance", + principalColumn: "UserId", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_BookQuery_ApplicationUser_ClientId", + table: "BookQuery", + column: "ClientId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_BookQuery_PerformerProfile_PerformerId", + table: "BookQuery", + column: "PerformerId", + principalTable: "PerformerProfile", + principalColumn: "PerformerId", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_CircleMember_Circle_CircleId", + table: "CircleMember", + column: "CircleId", + principalTable: "Circle", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_CircleMember_ApplicationUser_MemberId", + table: "CircleMember", + column: "MemberId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_Contact_ApplicationUser_OwnerId", + table: "Contact", + column: "OwnerId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_Activity_ActivityCode", + table: "PerformerProfile", + column: "ActivityCode", + principalTable: "Activity", + principalColumn: "Code", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_Location_OrganisationAddressId", + table: "PerformerProfile", + column: "OrganisationAddressId", + principalTable: "Location", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_ApplicationUser_PerformerId", + table: "PerformerProfile", + column: "PerformerId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + } + } +} diff --git a/Yavsc/Migrations/20160726161530_ExceptionsSIREN.Designer.cs b/Yavsc/Migrations/20160726161530_ExceptionsSIREN.Designer.cs new file mode 100644 index 00000000..aa82fbaa --- /dev/null +++ b/Yavsc/Migrations/20160726161530_ExceptionsSIREN.Designer.cs @@ -0,0 +1,671 @@ +using System; +using Microsoft.Data.Entity; +using Microsoft.Data.Entity.Infrastructure; +using Microsoft.Data.Entity.Migrations; +using Yavsc.Models; + +namespace Yavsc.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + [Migration("20160726161530_ExceptionsSIREN")] + partial class ExceptionsSIREN + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { + modelBuilder + .HasAnnotation("ProductVersion", "7.0.0-rc1-16348"); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRole", b => + { + b.Property("Id"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken(); + + b.Property("Name") + .HasAnnotation("MaxLength", 256); + + b.Property("NormalizedName") + .HasAnnotation("MaxLength", 256); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .HasAnnotation("Relational:Name", "RoleNameIndex"); + + b.HasAnnotation("Relational:TableName", "AspNetRoles"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClaimType"); + + b.Property("ClaimValue"); + + b.Property("RoleId") + .IsRequired(); + + b.HasKey("Id"); + + b.HasAnnotation("Relational:TableName", "AspNetRoleClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClaimType"); + + b.Property("ClaimValue"); + + b.Property("UserId") + .IsRequired(); + + b.HasKey("Id"); + + b.HasAnnotation("Relational:TableName", "AspNetUserClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserLogin", b => + { + b.Property("LoginProvider"); + + b.Property("ProviderKey"); + + b.Property("ProviderDisplayName"); + + b.Property("UserId") + .IsRequired(); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasAnnotation("Relational:TableName", "AspNetUserLogins"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole", b => + { + b.Property("UserId"); + + b.Property("RoleId"); + + b.HasKey("UserId", "RoleId"); + + b.HasAnnotation("Relational:TableName", "AspNetUserRoles"); + }); + + modelBuilder.Entity("Yavsc.Location", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Address") + .IsRequired(); + + b.Property("Latitude"); + + b.Property("Longitude"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.AccountBalance", b => + { + b.Property("UserId"); + + b.Property("ContactCredits"); + + b.Property("Credits"); + + b.HasKey("UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Activity", b => + { + b.Property("Code") + .HasAnnotation("MaxLength", 512); + + b.Property("ActorDenomination"); + + b.Property("Description"); + + b.Property("ModeratorGroupName"); + + b.Property("Name") + .IsRequired() + .HasAnnotation("MaxLength", 512); + + b.Property("Photo"); + + b.HasKey("Code"); + }); + + modelBuilder.Entity("Yavsc.Models.ApplicationUser", b => + { + b.Property("Id"); + + b.Property("AccessFailedCount"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken(); + + b.Property("DedicatedGoogleCalendar"); + + b.Property("Email") + .HasAnnotation("MaxLength", 256); + + b.Property("EmailConfirmed"); + + b.Property("LockoutEnabled"); + + b.Property("LockoutEnd"); + + b.Property("NormalizedEmail") + .HasAnnotation("MaxLength", 256); + + b.Property("NormalizedUserName") + .HasAnnotation("MaxLength", 256); + + b.Property("PasswordHash"); + + b.Property("PhoneNumber"); + + b.Property("PhoneNumberConfirmed"); + + b.Property("PostalAddressId"); + + b.Property("SecurityStamp"); + + b.Property("TwoFactorEnabled"); + + b.Property("UserName") + .HasAnnotation("MaxLength", 256); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasAnnotation("Relational:Name", "EmailIndex"); + + b.HasIndex("NormalizedUserName") + .HasAnnotation("Relational:Name", "UserNameIndex"); + + b.HasAnnotation("Relational:TableName", "AspNetUsers"); + }); + + modelBuilder.Entity("Yavsc.Models.Auth.Client", b => + { + b.Property("Id"); + + b.Property("Active"); + + b.Property("DisplayName"); + + b.Property("LogoutRedirectUri") + .HasAnnotation("MaxLength", 100); + + b.Property("RedirectUri"); + + b.Property("RefreshTokenLifeTime"); + + b.Property("Secret"); + + b.Property("Type"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Auth.RefreshToken", b => + { + b.Property("Id"); + + b.Property("ClientId") + .IsRequired() + .HasAnnotation("MaxLength", 50); + + b.Property("ExpiresUtc"); + + b.Property("IssuedUtc"); + + b.Property("ProtectedTicket") + .IsRequired(); + + b.Property("Subject") + .IsRequired() + .HasAnnotation("MaxLength", 50); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.BalanceImpact", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BalanceId") + .IsRequired(); + + b.Property("ExecDate"); + + b.Property("Impact"); + + b.Property("Reason") + .IsRequired(); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.CommandLine", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ArticleId"); + + b.Property("BookQueryId"); + + b.Property("Comment"); + + b.Property("Count"); + + b.Property("EstimateId"); + + b.Property("UnitaryCost"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.Estimate", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AttachedFilesString"); + + b.Property("AttachedGraphicsString"); + + b.Property("CommandId"); + + b.Property("Description"); + + b.Property("Status"); + + b.Property("Title"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.ExceptionSIREN", b => + { + b.Property("SIREN"); + + b.HasKey("SIREN"); + }); + + modelBuilder.Entity("Yavsc.Models.Blog", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AuthorId"); + + b.Property("bcontent"); + + b.Property("modified"); + + b.Property("photo"); + + b.Property("posted") + .ValueGeneratedOnAdd() + .HasAnnotation("Relational:GeneratedValueSql", "LOCALTIMESTAMP"); + + b.Property("rate"); + + b.Property("title"); + + b.Property("visible"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Booking.BookQuery", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClientId") + .IsRequired(); + + b.Property("CreationDate") + .ValueGeneratedOnAdd() + .HasAnnotation("Relational:GeneratedValueSql", "LOCALTIMESTAMP"); + + b.Property("EventDate"); + + b.Property("Lag"); + + b.Property("LocationId"); + + b.Property("PerformerId") + .IsRequired(); + + b.Property("Previsional"); + + b.Property("ValidationDate"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Circle", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Name"); + + b.Property("OwnerId"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.CircleMember", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("CircleId") + .IsRequired(); + + b.Property("MemberId") + .IsRequired(); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Contact", b => + { + b.Property("OwnerId"); + + b.Property("UserId"); + + b.HasKey("OwnerId", "UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Identity.GoogleCloudMobileDeclaration", b => + { + b.Property("DeviceId"); + + b.Property("DeclarationDate") + .ValueGeneratedOnAdd() + .HasAnnotation("Relational:GeneratedValueSql", "LOCALTIMESTAMP"); + + b.Property("DeviceOwnerId"); + + b.Property("GCMRegistrationId") + .IsRequired(); + + b.Property("Model"); + + b.Property("Platform"); + + b.Property("Version"); + + b.HasKey("DeviceId"); + }); + + modelBuilder.Entity("Yavsc.Models.Market.BaseProduct", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Description"); + + b.Property("Name"); + + b.Property("Public"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Market.Service", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Billing"); + + b.Property("ContextId"); + + b.Property("Description"); + + b.Property("Name"); + + b.Property("Pricing"); + + b.Property("Public"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.OAuth.OAuth2Tokens", b => + { + b.Property("UserId"); + + b.Property("AccessToken"); + + b.Property("Expiration"); + + b.Property("ExpiresIn"); + + b.Property("RefreshToken"); + + b.Property("TokenType"); + + b.HasKey("UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Skill", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Name"); + + b.Property("Rate"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.PerformerProfile", b => + { + b.Property("PerformerId"); + + b.Property("AcceptGeoLocalization"); + + b.Property("AcceptNotifications"); + + b.Property("AcceptPublicContact"); + + b.Property("Active"); + + b.Property("ActivityCode") + .IsRequired(); + + b.Property("MaxDailyCost"); + + b.Property("MinDailyCost"); + + b.Property("OfferId"); + + b.Property("OrganizationAddressId"); + + b.Property("Rate"); + + b.Property("SIREN") + .IsRequired() + .HasAnnotation("MaxLength", 14); + + b.Property("WebSite"); + + b.HasKey("PerformerId"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRoleClaim", b => + { + b.HasOne("Microsoft.AspNet.Identity.EntityFramework.IdentityRole") + .WithMany() + .HasForeignKey("RoleId"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserClaim", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserLogin", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole", b => + { + b.HasOne("Microsoft.AspNet.Identity.EntityFramework.IdentityRole") + .WithMany() + .HasForeignKey("RoleId"); + + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.AccountBalance", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithOne() + .HasForeignKey("Yavsc.Models.AccountBalance", "UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.ApplicationUser", b => + { + b.HasOne("Yavsc.Location") + .WithMany() + .HasForeignKey("PostalAddressId"); + }); + + modelBuilder.Entity("Yavsc.Models.BalanceImpact", b => + { + b.HasOne("Yavsc.Models.AccountBalance") + .WithMany() + .HasForeignKey("BalanceId"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.CommandLine", b => + { + b.HasOne("Yavsc.Models.Market.BaseProduct") + .WithMany() + .HasForeignKey("ArticleId"); + + b.HasOne("Yavsc.Models.Booking.BookQuery") + .WithMany() + .HasForeignKey("BookQueryId"); + + b.HasOne("Yavsc.Models.Billing.Estimate") + .WithMany() + .HasForeignKey("EstimateId"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.Estimate", b => + { + b.HasOne("Yavsc.Models.Booking.BookQuery") + .WithMany() + .HasForeignKey("CommandId"); + }); + + modelBuilder.Entity("Yavsc.Models.Blog", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("AuthorId"); + }); + + modelBuilder.Entity("Yavsc.Models.Booking.BookQuery", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("ClientId"); + + b.HasOne("Yavsc.Location") + .WithMany() + .HasForeignKey("LocationId"); + + b.HasOne("Yavsc.Models.Workflow.PerformerProfile") + .WithMany() + .HasForeignKey("PerformerId"); + }); + + modelBuilder.Entity("Yavsc.Models.Circle", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("OwnerId"); + }); + + modelBuilder.Entity("Yavsc.Models.CircleMember", b => + { + b.HasOne("Yavsc.Models.Circle") + .WithMany() + .HasForeignKey("CircleId"); + + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("MemberId"); + }); + + modelBuilder.Entity("Yavsc.Models.Contact", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("OwnerId"); + }); + + modelBuilder.Entity("Yavsc.Models.Identity.GoogleCloudMobileDeclaration", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("DeviceOwnerId"); + }); + + modelBuilder.Entity("Yavsc.Models.Market.Service", b => + { + b.HasOne("Yavsc.Models.Activity") + .WithMany() + .HasForeignKey("ContextId"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.PerformerProfile", b => + { + b.HasOne("Yavsc.Models.Activity") + .WithMany() + .HasForeignKey("ActivityCode"); + + b.HasOne("Yavsc.Models.Market.Service") + .WithMany() + .HasForeignKey("OfferId"); + + b.HasOne("Yavsc.Location") + .WithMany() + .HasForeignKey("OrganizationAddressId"); + + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("PerformerId"); + }); + } + } +} diff --git a/Yavsc/Migrations/20160726161530_ExceptionsSIREN.cs b/Yavsc/Migrations/20160726161530_ExceptionsSIREN.cs new file mode 100644 index 00000000..bba58e93 --- /dev/null +++ b/Yavsc/Migrations/20160726161530_ExceptionsSIREN.cs @@ -0,0 +1,266 @@ +using Microsoft.Data.Entity.Migrations; + +namespace Yavsc.Migrations +{ + public partial class ExceptionsSIREN : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey(name: "FK_IdentityRoleClaim_IdentityRole_RoleId", table: "AspNetRoleClaims"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserClaim_ApplicationUser_UserId", table: "AspNetUserClaims"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserLogin_ApplicationUser_UserId", table: "AspNetUserLogins"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole_IdentityRole_RoleId", table: "AspNetUserRoles"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole_ApplicationUser_UserId", table: "AspNetUserRoles"); + migrationBuilder.DropForeignKey(name: "FK_AccountBalance_ApplicationUser_UserId", table: "AccountBalance"); + migrationBuilder.DropForeignKey(name: "FK_BalanceImpact_AccountBalance_BalanceId", table: "BalanceImpact"); + migrationBuilder.DropForeignKey(name: "FK_BookQuery_ApplicationUser_ClientId", table: "BookQuery"); + migrationBuilder.DropForeignKey(name: "FK_BookQuery_PerformerProfile_PerformerId", table: "BookQuery"); + migrationBuilder.DropForeignKey(name: "FK_CircleMember_Circle_CircleId", table: "CircleMember"); + migrationBuilder.DropForeignKey(name: "FK_CircleMember_ApplicationUser_MemberId", table: "CircleMember"); + migrationBuilder.DropForeignKey(name: "FK_Contact_ApplicationUser_OwnerId", table: "Contact"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Activity_ActivityCode", table: "PerformerProfile"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Location_OrganizationAddressId", table: "PerformerProfile"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_ApplicationUser_PerformerId", table: "PerformerProfile"); + migrationBuilder.CreateTable( + name: "ExceptionSIREN", + columns: table => new + { + SIREN = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_ExceptionSIREN", x => x.SIREN); + }); + migrationBuilder.AddForeignKey( + name: "FK_IdentityRoleClaim_IdentityRole_RoleId", + table: "AspNetRoleClaims", + column: "RoleId", + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserClaim_ApplicationUser_UserId", + table: "AspNetUserClaims", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserLogin_ApplicationUser_UserId", + table: "AspNetUserLogins", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserRole_IdentityRole_RoleId", + table: "AspNetUserRoles", + column: "RoleId", + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserRole_ApplicationUser_UserId", + table: "AspNetUserRoles", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_AccountBalance_ApplicationUser_UserId", + table: "AccountBalance", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_BalanceImpact_AccountBalance_BalanceId", + table: "BalanceImpact", + column: "BalanceId", + principalTable: "AccountBalance", + principalColumn: "UserId", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_BookQuery_ApplicationUser_ClientId", + table: "BookQuery", + column: "ClientId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_BookQuery_PerformerProfile_PerformerId", + table: "BookQuery", + column: "PerformerId", + principalTable: "PerformerProfile", + principalColumn: "PerformerId", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_CircleMember_Circle_CircleId", + table: "CircleMember", + column: "CircleId", + principalTable: "Circle", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_CircleMember_ApplicationUser_MemberId", + table: "CircleMember", + column: "MemberId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_Contact_ApplicationUser_OwnerId", + table: "Contact", + column: "OwnerId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_Activity_ActivityCode", + table: "PerformerProfile", + column: "ActivityCode", + principalTable: "Activity", + principalColumn: "Code", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_Location_OrganizationAddressId", + table: "PerformerProfile", + column: "OrganizationAddressId", + principalTable: "Location", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_ApplicationUser_PerformerId", + table: "PerformerProfile", + column: "PerformerId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey(name: "FK_IdentityRoleClaim_IdentityRole_RoleId", table: "AspNetRoleClaims"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserClaim_ApplicationUser_UserId", table: "AspNetUserClaims"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserLogin_ApplicationUser_UserId", table: "AspNetUserLogins"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole_IdentityRole_RoleId", table: "AspNetUserRoles"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole_ApplicationUser_UserId", table: "AspNetUserRoles"); + migrationBuilder.DropForeignKey(name: "FK_AccountBalance_ApplicationUser_UserId", table: "AccountBalance"); + migrationBuilder.DropForeignKey(name: "FK_BalanceImpact_AccountBalance_BalanceId", table: "BalanceImpact"); + migrationBuilder.DropForeignKey(name: "FK_BookQuery_ApplicationUser_ClientId", table: "BookQuery"); + migrationBuilder.DropForeignKey(name: "FK_BookQuery_PerformerProfile_PerformerId", table: "BookQuery"); + migrationBuilder.DropForeignKey(name: "FK_CircleMember_Circle_CircleId", table: "CircleMember"); + migrationBuilder.DropForeignKey(name: "FK_CircleMember_ApplicationUser_MemberId", table: "CircleMember"); + migrationBuilder.DropForeignKey(name: "FK_Contact_ApplicationUser_OwnerId", table: "Contact"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Activity_ActivityCode", table: "PerformerProfile"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Location_OrganizationAddressId", table: "PerformerProfile"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_ApplicationUser_PerformerId", table: "PerformerProfile"); + migrationBuilder.DropTable("ExceptionSIREN"); + migrationBuilder.AddForeignKey( + name: "FK_IdentityRoleClaim_IdentityRole_RoleId", + table: "AspNetRoleClaims", + column: "RoleId", + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserClaim_ApplicationUser_UserId", + table: "AspNetUserClaims", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserLogin_ApplicationUser_UserId", + table: "AspNetUserLogins", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserRole_IdentityRole_RoleId", + table: "AspNetUserRoles", + column: "RoleId", + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserRole_ApplicationUser_UserId", + table: "AspNetUserRoles", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_AccountBalance_ApplicationUser_UserId", + table: "AccountBalance", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_BalanceImpact_AccountBalance_BalanceId", + table: "BalanceImpact", + column: "BalanceId", + principalTable: "AccountBalance", + principalColumn: "UserId", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_BookQuery_ApplicationUser_ClientId", + table: "BookQuery", + column: "ClientId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_BookQuery_PerformerProfile_PerformerId", + table: "BookQuery", + column: "PerformerId", + principalTable: "PerformerProfile", + principalColumn: "PerformerId", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_CircleMember_Circle_CircleId", + table: "CircleMember", + column: "CircleId", + principalTable: "Circle", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_CircleMember_ApplicationUser_MemberId", + table: "CircleMember", + column: "MemberId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_Contact_ApplicationUser_OwnerId", + table: "Contact", + column: "OwnerId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_Activity_ActivityCode", + table: "PerformerProfile", + column: "ActivityCode", + principalTable: "Activity", + principalColumn: "Code", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_Location_OrganizationAddressId", + table: "PerformerProfile", + column: "OrganizationAddressId", + principalTable: "Location", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_ApplicationUser_PerformerId", + table: "PerformerProfile", + column: "PerformerId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + } + } +} diff --git a/Yavsc/Migrations/ApplicationDbContextModelSnapshot.cs b/Yavsc/Migrations/ApplicationDbContextModelSnapshot.cs index 97767d69..a9fd75a9 100644 --- a/Yavsc/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/Yavsc/Migrations/ApplicationDbContextModelSnapshot.cs @@ -13,23 +13,6 @@ namespace Yavsc.Migrations modelBuilder .HasAnnotation("ProductVersion", "7.0.0-rc1-16348"); - modelBuilder.Entity("GoogleCloudMobileDeclaration", b => - { - b.Property("DeviceId"); - - b.Property("DeviceOwnerId"); - - b.Property("GCMRegistrationId"); - - b.Property("Model"); - - b.Property("Platform"); - - b.Property("Version"); - - b.HasKey("DeviceId"); - }); - modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRole", b => { b.Property("Id"); @@ -285,14 +268,14 @@ namespace Yavsc.Migrations b.Property("Count"); - b.Property("RDVEstimateId"); + b.Property("EstimateId"); b.Property("UnitaryCost"); b.HasKey("Id"); }); - modelBuilder.Entity("Yavsc.Models.Billing.RDVEstimate", b => + modelBuilder.Entity("Yavsc.Models.Billing.Estimate", b => { b.Property("Id") .ValueGeneratedOnAdd(); @@ -312,13 +295,19 @@ namespace Yavsc.Migrations b.HasKey("Id"); }); + modelBuilder.Entity("Yavsc.Models.Billing.ExceptionSIREN", b => + { + b.Property("SIREN"); + + b.HasKey("SIREN"); + }); + modelBuilder.Entity("Yavsc.Models.Blog", b => { b.Property("Id") .ValueGeneratedOnAdd(); - b.Property("AuthorId") - .IsRequired(); + b.Property("AuthorId"); b.Property("bcontent"); @@ -326,7 +315,9 @@ namespace Yavsc.Migrations b.Property("photo"); - b.Property("posted"); + b.Property("posted") + .ValueGeneratedOnAdd() + .HasAnnotation("Relational:GeneratedValueSql", "LOCALTIMESTAMP"); b.Property("rate"); @@ -400,6 +391,28 @@ namespace Yavsc.Migrations b.HasKey("OwnerId", "UserId"); }); + modelBuilder.Entity("Yavsc.Models.Identity.GoogleCloudMobileDeclaration", b => + { + b.Property("DeviceId"); + + b.Property("DeclarationDate") + .ValueGeneratedOnAdd() + .HasAnnotation("Relational:GeneratedValueSql", "LOCALTIMESTAMP"); + + b.Property("DeviceOwnerId"); + + b.Property("GCMRegistrationId") + .IsRequired(); + + b.Property("Model"); + + b.Property("Platform"); + + b.Property("Version"); + + b.HasKey("DeviceId"); + }); + modelBuilder.Entity("Yavsc.Models.Market.BaseProduct", b => { b.Property("Id") @@ -465,9 +478,9 @@ namespace Yavsc.Migrations modelBuilder.Entity("Yavsc.Models.Workflow.PerformerProfile", b => { - b.Property("PerfomerId"); + b.Property("PerformerId"); - b.Property("AcceptGeoLocalisation"); + b.Property("AcceptGeoLocalization"); b.Property("AcceptNotifications"); @@ -484,7 +497,7 @@ namespace Yavsc.Migrations b.Property("OfferId"); - b.Property("OrganisationAddressId"); + b.Property("OrganizationAddressId"); b.Property("Rate"); @@ -494,14 +507,7 @@ namespace Yavsc.Migrations b.Property("WebSite"); - b.HasKey("PerfomerId"); - }); - - modelBuilder.Entity("GoogleCloudMobileDeclaration", b => - { - b.HasOne("Yavsc.Models.ApplicationUser") - .WithMany() - .HasForeignKey("DeviceOwnerId"); + b.HasKey("PerformerId"); }); modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRoleClaim", b => @@ -567,12 +573,12 @@ namespace Yavsc.Migrations .WithMany() .HasForeignKey("BookQueryId"); - b.HasOne("Yavsc.Models.Billing.RDVEstimate") + b.HasOne("Yavsc.Models.Billing.Estimate") .WithMany() - .HasForeignKey("RDVEstimateId"); + .HasForeignKey("EstimateId"); }); - modelBuilder.Entity("Yavsc.Models.Billing.RDVEstimate", b => + modelBuilder.Entity("Yavsc.Models.Billing.Estimate", b => { b.HasOne("Yavsc.Models.Booking.BookQuery") .WithMany() @@ -626,6 +632,13 @@ namespace Yavsc.Migrations .HasForeignKey("OwnerId"); }); + modelBuilder.Entity("Yavsc.Models.Identity.GoogleCloudMobileDeclaration", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("DeviceOwnerId"); + }); + modelBuilder.Entity("Yavsc.Models.Market.Service", b => { b.HasOne("Yavsc.Models.Activity") @@ -645,11 +658,11 @@ namespace Yavsc.Migrations b.HasOne("Yavsc.Location") .WithMany() - .HasForeignKey("OrganisationAddressId"); + .HasForeignKey("OrganizationAddressId"); b.HasOne("Yavsc.Models.ApplicationUser") .WithMany() - .HasForeignKey("PerfomerId"); + .HasForeignKey("PerformerId"); }); } } diff --git a/Yavsc.Api/Model/Access/Publishing.cs b/Yavsc/Model/Access/Publishing.cs similarity index 100% rename from Yavsc.Api/Model/Access/Publishing.cs rename to Yavsc/Model/Access/Publishing.cs diff --git a/Yavsc/Model/ApplicationDbContext.cs b/Yavsc/Model/ApplicationDbContext.cs index f25c1cca..c26bdf50 100644 --- a/Yavsc/Model/ApplicationDbContext.cs +++ b/Yavsc/Model/ApplicationDbContext.cs @@ -25,7 +25,10 @@ namespace Yavsc.Models // Add your customizations after calling base.OnModelCreating(builder); builder.Entity().HasKey(x => new { x.OwnerId, x.UserId }); builder.Entity().Property(x=>x.CreationDate).HasDefaultValueSql("LOCALTIMESTAMP"); + builder.Entity().Property(x=>x.posted).HasDefaultValueSql("LOCALTIMESTAMP"); + builder.Entity().Property(x=>x.DeclarationDate).HasDefaultValueSql("LOCALTIMESTAMP"); } + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { optionsBuilder.UseNpgsql(Startup.ConnectionString); @@ -72,7 +75,7 @@ namespace Yavsc.Models /// public DbSet BookQueries { get; set; } public DbSet Performers { get; set; } - public DbSet Estimates { get; set; } + public DbSet Estimates { get; set; } public DbSet BankStatus { get; set; } public DbSet BankBook { get; set; } public DbSet Map { get; set; } @@ -164,6 +167,6 @@ namespace Yavsc.Models app=>app.Id == clientId); } - + public DbSet ExceptionsSIREN { get; set; } } } diff --git a/Yavsc.Api/Model/Auth/ApplicationTypes.cs b/Yavsc/Model/Auth/ApplicationTypes.cs similarity index 100% rename from Yavsc.Api/Model/Auth/ApplicationTypes.cs rename to Yavsc/Model/Auth/ApplicationTypes.cs diff --git a/Yavsc.Api/Model/Auth/Client.cs b/Yavsc/Model/Auth/Client.cs similarity index 100% rename from Yavsc.Api/Model/Auth/Client.cs rename to Yavsc/Model/Auth/Client.cs diff --git a/Yavsc.Api/Model/Auth/ExternalViewModel.cs b/Yavsc/Model/Auth/ExternalViewModel.cs similarity index 100% rename from Yavsc.Api/Model/Auth/ExternalViewModel.cs rename to Yavsc/Model/Auth/ExternalViewModel.cs diff --git a/Yavsc.Api/Model/Auth/OAuth2Tokens.cs b/Yavsc/Model/Auth/OAuth2Tokens.cs similarity index 100% rename from Yavsc.Api/Model/Auth/OAuth2Tokens.cs rename to Yavsc/Model/Auth/OAuth2Tokens.cs diff --git a/Yavsc.Api/Model/Auth/RefreshToken.cs b/Yavsc/Model/Auth/RefreshToken.cs similarity index 100% rename from Yavsc.Api/Model/Auth/RefreshToken.cs rename to Yavsc/Model/Auth/RefreshToken.cs diff --git a/Yavsc.Api/Model/Auth/Scope.cs b/Yavsc/Model/Auth/Scope.cs similarity index 100% rename from Yavsc.Api/Model/Auth/Scope.cs rename to Yavsc/Model/Auth/Scope.cs diff --git a/Yavsc.Api/Model/Auth/UserCredentials.cs b/Yavsc/Model/Auth/UserCredentials.cs similarity index 100% rename from Yavsc.Api/Model/Auth/UserCredentials.cs rename to Yavsc/Model/Auth/UserCredentials.cs diff --git a/Yavsc.Api/Model/Bank/AccountBalance.cs b/Yavsc/Model/Bank/AccountBalance.cs similarity index 83% rename from Yavsc.Api/Model/Bank/AccountBalance.cs rename to Yavsc/Model/Bank/AccountBalance.cs index 56ae4479..8070f37b 100644 --- a/Yavsc.Api/Model/Bank/AccountBalance.cs +++ b/Yavsc/Model/Bank/AccountBalance.cs @@ -1,5 +1,6 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using Yavsc.Interfaces; namespace Yavsc.Models { @@ -10,7 +11,7 @@ namespace Yavsc.Models public string UserId { get; set; } [ForeignKey("UserId")] - public virtual IApplicationUser Owner { get; set; } + public virtual ApplicationUser Owner { get; set; } [Required,Display(Name="Credits in €")] public decimal Credits { get; set; } diff --git a/Yavsc.Api/Model/Bank/BalanceImpact.cs b/Yavsc/Model/Bank/BalanceImpact.cs similarity index 100% rename from Yavsc.Api/Model/Bank/BalanceImpact.cs rename to Yavsc/Model/Bank/BalanceImpact.cs diff --git a/Yavsc.Api/Model/Billing/Command.cs b/Yavsc/Model/Billing/Command.cs similarity index 100% rename from Yavsc.Api/Model/Billing/Command.cs rename to Yavsc/Model/Billing/Command.cs diff --git a/Yavsc.Api/Model/Billing/CommandLine.cs b/Yavsc/Model/Billing/CommandLine.cs similarity index 100% rename from Yavsc.Api/Model/Billing/CommandLine.cs rename to Yavsc/Model/Billing/CommandLine.cs diff --git a/Yavsc/Model/Billing/Contract.cs b/Yavsc/Model/Billing/Contract.cs new file mode 100644 index 00000000..896293db --- /dev/null +++ b/Yavsc/Model/Billing/Contract.cs @@ -0,0 +1,11 @@ +using Yavsc.Models.Market; + +namespace Yavsc.Models.Billing +{ + + public class ServiceContract

where P : Service + { + + } + +} \ No newline at end of file diff --git a/Yavsc.Api/Model/Billing/Estimate.cs b/Yavsc/Model/Billing/Estimate.cs similarity index 98% rename from Yavsc.Api/Model/Billing/Estimate.cs rename to Yavsc/Model/Billing/Estimate.cs index c4036975..f33192c0 100644 --- a/Yavsc.Api/Model/Billing/Estimate.cs +++ b/Yavsc/Model/Billing/Estimate.cs @@ -7,7 +7,7 @@ using Yavsc.Models.Booking; namespace Yavsc.Models.Billing { - public partial class RDVEstimate + public partial class Estimate { [Key(), DatabaseGenerated(DatabaseGeneratedOption.Identity)] public long Id { get; set; } diff --git a/Yavsc.Api/Model/Billing/EstimateAgreement.cs b/Yavsc/Model/Billing/EstimateAgreement.cs similarity index 52% rename from Yavsc.Api/Model/Billing/EstimateAgreement.cs rename to Yavsc/Model/Billing/EstimateAgreement.cs index e9d8573a..a290f900 100644 --- a/Yavsc.Api/Model/Billing/EstimateAgreement.cs +++ b/Yavsc/Model/Billing/EstimateAgreement.cs @@ -1,10 +1,12 @@ using System; +using System.ComponentModel.DataAnnotations; namespace Yavsc.Models.Billing { - public partial class EstimateAgreement : RDVEstimate + public partial class Contract : Estimate { + [Required] public DateTime ClientValidationDate { get; set; } } } \ No newline at end of file diff --git a/Yavsc/Model/Billing/ExceptionSIREN.cs b/Yavsc/Model/Billing/ExceptionSIREN.cs new file mode 100644 index 00000000..f8889f33 --- /dev/null +++ b/Yavsc/Model/Billing/ExceptionSIREN.cs @@ -0,0 +1,10 @@ +using System.ComponentModel.DataAnnotations; + +namespace Yavsc.Models.Billing +{ + public class ExceptionSIREN { + + [Key] + public string SIREN { get; set; } + } +} \ No newline at end of file diff --git a/Yavsc.Api/Model/Billing/NominatvieCommande.cs b/Yavsc/Model/Billing/NominatvieCommande.cs similarity index 100% rename from Yavsc.Api/Model/Billing/NominatvieCommande.cs rename to Yavsc/Model/Billing/NominatvieCommande.cs diff --git a/Yavsc.Api/Model/Billing/Service/ChatBilling.cs b/Yavsc/Model/Billing/Service/ChatBilling.cs similarity index 100% rename from Yavsc.Api/Model/Billing/Service/ChatBilling.cs rename to Yavsc/Model/Billing/Service/ChatBilling.cs diff --git a/Yavsc.Api/Model/Billing/histoestim.cs b/Yavsc/Model/Billing/histoestim.cs similarity index 100% rename from Yavsc.Api/Model/Billing/histoestim.cs rename to Yavsc/Model/Billing/histoestim.cs diff --git a/Yavsc.Api/Model/Billing/satisfaction.cs b/Yavsc/Model/Billing/satisfaction.cs similarity index 100% rename from Yavsc.Api/Model/Billing/satisfaction.cs rename to Yavsc/Model/Billing/satisfaction.cs diff --git a/Yavsc.Api/Model/Billing/writtings.cs b/Yavsc/Model/Billing/writtings.cs similarity index 100% rename from Yavsc.Api/Model/Billing/writtings.cs rename to Yavsc/Model/Billing/writtings.cs diff --git a/Yavsc.Api/Model/Billing/wrtags.cs b/Yavsc/Model/Billing/wrtags.cs similarity index 100% rename from Yavsc.Api/Model/Billing/wrtags.cs rename to Yavsc/Model/Billing/wrtags.cs diff --git a/Yavsc.Api/Model/Blog/Blog.cs b/Yavsc/Model/Blog/Blog.cs similarity index 66% rename from Yavsc.Api/Model/Blog/Blog.cs rename to Yavsc/Model/Blog/Blog.cs index 8f362f54..bdce0645 100644 --- a/Yavsc.Api/Model/Blog/Blog.cs +++ b/Yavsc/Model/Blog/Blog.cs @@ -4,22 +4,28 @@ using System.ComponentModel.DataAnnotations.Schema; namespace Yavsc.Models { - public partial class Blog: IBlog + public partial class Blog { [Key(), DatabaseGenerated(DatabaseGeneratedOption.Identity)] public long Id { get; set; } + + [Display(Name="Content")] public string bcontent { get; set; } - [DisplayAttribute(Name="Modified")] + [Display(Name="Modified")] public DateTime modified { get; set; } + [Display(Name="Photo")] public string photo { get; set; } + [Display(Name="Posted")] public DateTime posted { get; set; } + [Display(Name="Rate")] public int rate { get; set; } + [Display(Name="Title")] public string title { get; set; } - [Required] public string AuthorId { get; set; } [ForeignKey("AuthorId")] - public IApplicationUser Author { set; get; } + public ApplicationUser Author { set; get; } + [Display(Name="Visible")] public bool visible { get; set; } } } diff --git a/Yavsc.Api/Model/Blog/BlogAccess.cs b/Yavsc/Model/Blog/BlogAccess.cs similarity index 100% rename from Yavsc.Api/Model/Blog/BlogAccess.cs rename to Yavsc/Model/Blog/BlogAccess.cs diff --git a/Yavsc.Api/Model/Blog/IBlogspotRepository.cs b/Yavsc/Model/Blog/IBlogspotRepository.cs similarity index 100% rename from Yavsc.Api/Model/Blog/IBlogspotRepository.cs rename to Yavsc/Model/Blog/IBlogspotRepository.cs diff --git a/Yavsc.Api/Model/Blog/comment.cs b/Yavsc/Model/Blog/comment.cs similarity index 100% rename from Yavsc.Api/Model/Blog/comment.cs rename to Yavsc/Model/Blog/comment.cs diff --git a/Yavsc.Api/Model/Booking/BookQuery.cs b/Yavsc/Model/Booking/BookQuery.cs similarity index 95% rename from Yavsc.Api/Model/Booking/BookQuery.cs rename to Yavsc/Model/Booking/BookQuery.cs index 87e31b68..d763b30c 100644 --- a/Yavsc.Api/Model/Booking/BookQuery.cs +++ b/Yavsc/Model/Booking/BookQuery.cs @@ -15,6 +15,8 @@ namespace Yavsc.Models.Booking ///

[Key(), DatabaseGenerated(DatabaseGeneratedOption.Identity)] public long Id {get; set; } + + [Display(Name="Event date")] public DateTime EventDate{get; set; } public Location Location { get; set; } diff --git a/Yavsc.Api/Model/Booking/RendezVous.cs b/Yavsc/Model/Booking/RendezVous.cs similarity index 100% rename from Yavsc.Api/Model/Booking/RendezVous.cs rename to Yavsc/Model/Booking/RendezVous.cs diff --git a/Yavsc.Api/Model/Calendar/ICalendarManager.cs b/Yavsc/Model/Calendar/ICalendarManager.cs similarity index 100% rename from Yavsc.Api/Model/Calendar/ICalendarManager.cs rename to Yavsc/Model/Calendar/ICalendarManager.cs diff --git a/Yavsc.Api/Model/Calendar/IFreeDateSet.cs b/Yavsc/Model/Calendar/IFreeDateSet.cs similarity index 100% rename from Yavsc.Api/Model/Calendar/IFreeDateSet.cs rename to Yavsc/Model/Calendar/IFreeDateSet.cs diff --git a/Yavsc.Api/Model/Calendar/OpenDay.cs b/Yavsc/Model/Calendar/OpenDay.cs similarity index 100% rename from Yavsc.Api/Model/Calendar/OpenDay.cs rename to Yavsc/Model/Calendar/OpenDay.cs diff --git a/Yavsc.Api/Model/Calendar/Period.cs b/Yavsc/Model/Calendar/Period.cs similarity index 100% rename from Yavsc.Api/Model/Calendar/Period.cs rename to Yavsc/Model/Calendar/Period.cs diff --git a/Yavsc.Api/Model/Calendar/Periodicity.cs b/Yavsc/Model/Calendar/Periodicity.cs similarity index 100% rename from Yavsc.Api/Model/Calendar/Periodicity.cs rename to Yavsc/Model/Calendar/Periodicity.cs diff --git a/Yavsc.Api/Model/Calendar/PositionAndKeyphrase.cs b/Yavsc/Model/Calendar/PositionAndKeyphrase.cs similarity index 100% rename from Yavsc.Api/Model/Calendar/PositionAndKeyphrase.cs rename to Yavsc/Model/Calendar/PositionAndKeyphrase.cs diff --git a/Yavsc.Api/Model/Calendar/ProvidedEvent.cs b/Yavsc/Model/Calendar/ProvidedEvent.cs similarity index 100% rename from Yavsc.Api/Model/Calendar/ProvidedEvent.cs rename to Yavsc/Model/Calendar/ProvidedEvent.cs diff --git a/Yavsc.Api/Model/Calendar/Schedule.cs b/Yavsc/Model/Calendar/Schedule.cs similarity index 100% rename from Yavsc.Api/Model/Calendar/Schedule.cs rename to Yavsc/Model/Calendar/Schedule.cs diff --git a/Yavsc.Api/Model/Calendar/WeekDay.cs b/Yavsc/Model/Calendar/WeekDay.cs similarity index 100% rename from Yavsc.Api/Model/Calendar/WeekDay.cs rename to Yavsc/Model/Calendar/WeekDay.cs diff --git a/Yavsc.Api/Model/Edition/IDocument.cs b/Yavsc/Model/Edition/IDocument.cs similarity index 100% rename from Yavsc.Api/Model/Edition/IDocument.cs rename to Yavsc/Model/Edition/IDocument.cs diff --git a/Yavsc.Api/Model/Google/AuthToken.cs b/Yavsc/Model/Google/AuthToken.cs similarity index 100% rename from Yavsc.Api/Model/Google/AuthToken.cs rename to Yavsc/Model/Google/AuthToken.cs diff --git a/Yavsc.Api/Model/Google/Calendar/CalendarEventList.cs b/Yavsc/Model/Google/Calendar/CalendarEventList.cs similarity index 100% rename from Yavsc.Api/Model/Google/Calendar/CalendarEventList.cs rename to Yavsc/Model/Google/Calendar/CalendarEventList.cs diff --git a/Yavsc.Api/Model/Google/Calendar/CalendarList.cs b/Yavsc/Model/Google/Calendar/CalendarList.cs similarity index 100% rename from Yavsc.Api/Model/Google/Calendar/CalendarList.cs rename to Yavsc/Model/Google/Calendar/CalendarList.cs diff --git a/Yavsc.Api/Model/Google/Calendar/CalendarListEntry.cs b/Yavsc/Model/Google/Calendar/CalendarListEntry.cs similarity index 100% rename from Yavsc.Api/Model/Google/Calendar/CalendarListEntry.cs rename to Yavsc/Model/Google/Calendar/CalendarListEntry.cs diff --git a/Yavsc.Api/Model/Google/GDate.cs b/Yavsc/Model/Google/GDate.cs similarity index 100% rename from Yavsc.Api/Model/Google/GDate.cs rename to Yavsc/Model/Google/GDate.cs diff --git a/Yavsc.Api/Model/Google/Messaging/GCMRegisterModel.cs b/Yavsc/Model/Google/Messaging/GCMRegisterModel.cs similarity index 100% rename from Yavsc.Api/Model/Google/Messaging/GCMRegisterModel.cs rename to Yavsc/Model/Google/Messaging/GCMRegisterModel.cs diff --git a/Yavsc.Api/Model/Google/Messaging/MessageWithPayLoad.cs b/Yavsc/Model/Google/Messaging/MessageWithPayLoad.cs similarity index 100% rename from Yavsc.Api/Model/Google/Messaging/MessageWithPayLoad.cs rename to Yavsc/Model/Google/Messaging/MessageWithPayLoad.cs diff --git a/Yavsc.Api/Model/Google/Messaging/MessageWithPayloadResponse.cs b/Yavsc/Model/Google/Messaging/MessageWithPayloadResponse.cs similarity index 100% rename from Yavsc.Api/Model/Google/Messaging/MessageWithPayloadResponse.cs rename to Yavsc/Model/Google/Messaging/MessageWithPayloadResponse.cs diff --git a/Yavsc.Api/Model/Google/People/People.cs b/Yavsc/Model/Google/People/People.cs similarity index 100% rename from Yavsc.Api/Model/Google/People/People.cs rename to Yavsc/Model/Google/People/People.cs diff --git a/Yavsc.Api/Model/Google/Resource.cs b/Yavsc/Model/Google/Resource.cs similarity index 100% rename from Yavsc.Api/Model/Google/Resource.cs rename to Yavsc/Model/Google/Resource.cs diff --git a/Yavsc.Api/Model/Google/Tracks/Entity.cs b/Yavsc/Model/Google/Tracks/Entity.cs similarity index 100% rename from Yavsc.Api/Model/Google/Tracks/Entity.cs rename to Yavsc/Model/Google/Tracks/Entity.cs diff --git a/Yavsc.Api/Model/Google/Tracks/EntityQuery.cs b/Yavsc/Model/Google/Tracks/EntityQuery.cs similarity index 100% rename from Yavsc.Api/Model/Google/Tracks/EntityQuery.cs rename to Yavsc/Model/Google/Tracks/EntityQuery.cs diff --git a/Yavsc.Api/Model/Identity/ApplicationUser.cs b/Yavsc/Model/Identity/ApplicationUser.cs similarity index 59% rename from Yavsc.Api/Model/Identity/ApplicationUser.cs rename to Yavsc/Model/Identity/ApplicationUser.cs index 6fa71131..94b3fcf9 100644 --- a/Yavsc.Api/Model/Identity/ApplicationUser.cs +++ b/Yavsc/Model/Identity/ApplicationUser.cs @@ -1,37 +1,37 @@ - -using System.Collections.Generic; -using Microsoft.AspNet.Identity.EntityFramework; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Yavsc.Models.Identity; - -namespace Yavsc.Models -{ - - public class ApplicationUser : IdentityUser, IApplicationUser - { - - [Display(Name="AccountBalance")] - public virtual IAccountBalance AccountBalance { get; set; } - - [InverseProperty("Author")] - public virtual IList Posts { get; set; } - - [InverseProperty("Owner")] - public virtual IList Book { get; set; } - - [InverseProperty("DeviceOwner")] - public virtual IList Devices { get; set; } - - [InverseProperty("Owner")] - - public virtual IList Circles { get; set; } - public virtual ILocation PostalAddress { get; set; } - - public string DedicatedGoogleCalendar { get; set; } - - public override string ToString() { - return this.Id+" "+this.AccountBalance?.Credits.ToString()+this.Email+" "+this.UserName+" $"+this.AccountBalance?.Credits.ToString(); - } - } -} + +using System.Collections.Generic; +using Microsoft.AspNet.Identity.EntityFramework; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using Yavsc.Models.Identity; + +namespace Yavsc.Models +{ + + public class ApplicationUser : IdentityUser + { + + [Display(Name="AccountBalance")] + public virtual AccountBalance AccountBalance { get; set; } + + [InverseProperty("Author")] + public virtual List Posts { get; set; } + + [InverseProperty("Owner")] + public virtual List Book { get; set; } + + [InverseProperty("DeviceOwner")] + public virtual List Devices { get; set; } + + [InverseProperty("Owner")] + + public virtual List Circles { get; set; } + public virtual Location PostalAddress { get; set; } + + public string DedicatedGoogleCalendar { get; set; } + + public override string ToString() { + return this.Id+" "+this.AccountBalance?.Credits.ToString()+this.Email+" "+this.UserName+" $"+this.AccountBalance?.Credits.ToString(); + } + } +} diff --git a/Yavsc.Api/Model/Identity/MobileAppDeclaration.cs b/Yavsc/Model/Identity/MobileAppDeclaration.cs similarity index 90% rename from Yavsc.Api/Model/Identity/MobileAppDeclaration.cs rename to Yavsc/Model/Identity/MobileAppDeclaration.cs index 516fd951..bedd6b92 100644 --- a/Yavsc.Api/Model/Identity/MobileAppDeclaration.cs +++ b/Yavsc/Model/Identity/MobileAppDeclaration.cs @@ -1,3 +1,4 @@ +using System; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using Newtonsoft.Json; @@ -18,7 +19,7 @@ namespace Yavsc.Models.Identity public string Platform { get; set; } public string Version { get; set; } public string DeviceOwnerId { get; set; } - + public DateTime DeclarationDate { get; set; } [JsonIgnore,ForeignKey("DeviceOwnerId")] public virtual ApplicationUser DeviceOwner { get; set; } } diff --git a/Yavsc.Api/Model/Identity/passwrecovery.cs b/Yavsc/Model/Identity/passwrecovery.cs similarity index 100% rename from Yavsc.Api/Model/Identity/passwrecovery.cs rename to Yavsc/Model/Identity/passwrecovery.cs diff --git a/Yavsc.Api/Model/Market/BaseProduct.cs b/Yavsc/Model/Market/BaseProduct.cs similarity index 100% rename from Yavsc.Api/Model/Market/BaseProduct.cs rename to Yavsc/Model/Market/BaseProduct.cs diff --git a/Yavsc.Api/Model/Market/Catalog.cs b/Yavsc/Model/Market/Catalog.cs similarity index 100% rename from Yavsc.Api/Model/Market/Catalog.cs rename to Yavsc/Model/Market/Catalog.cs diff --git a/Yavsc.Api/Model/Market/Product.cs b/Yavsc/Model/Market/Product.cs similarity index 100% rename from Yavsc.Api/Model/Market/Product.cs rename to Yavsc/Model/Market/Product.cs diff --git a/Yavsc/Model/Market/Service.cs b/Yavsc/Model/Market/Service.cs new file mode 100644 index 00000000..b0f2fdd7 --- /dev/null +++ b/Yavsc/Model/Market/Service.cs @@ -0,0 +1,67 @@ + +namespace Yavsc.Models.Market { + using System; + using System.ComponentModel.DataAnnotations.Schema; + + public enum BillingMode {  + Unitary, + SetPrice, + ByExecutionTime + } + + public interface IUnit { + string Name { get; } + bool CanConvertFrom(IUnit other); + VType ConvertFrom (IUnit other, VType orgValue) ; + } + public class Money : IUnit + { + public Money(string name, decimal euroExchangeRate) + { + Name = name; + EuroExchangeRate = euroExchangeRate; + } + + public string Name + { + get; private set ; + } + + public decimal EuroExchangeRate + { + get; private set ; + } + public bool CanConvertFrom(IUnit other) + { + if (other is Money) + return true; + return false; + } + + public decimal ConvertFrom(IUnit other, decimal orgValue) + { + if (other is Money) { + var om = other as Money; + return orgValue * om.EuroExchangeRate / EuroExchangeRate; + } + throw new NotImplementedException(); + } + } + + public partial class Service : BaseProduct + { + public string ContextId { get; set; } + [ForeignKey("ContextId")] + public virtual Activity Context { get; set; } + + public BillingMode? Billing { get; set; } + // TODO public ServiceSpecification Specification { get; set; } + /// + /// In euro + /// + /// + public decimal? Pricing { get; set; } + + } + +} \ No newline at end of file diff --git a/Yavsc.Api/Model/Messaging/BaseEvent.cs b/Yavsc/Model/Messaging/BaseEvent.cs similarity index 100% rename from Yavsc.Api/Model/Messaging/BaseEvent.cs rename to Yavsc/Model/Messaging/BaseEvent.cs diff --git a/Yavsc.Api/Model/Messaging/BookQueryEvent.cs b/Yavsc/Model/Messaging/BookQueryEvent.cs similarity index 94% rename from Yavsc.Api/Model/Messaging/BookQueryEvent.cs rename to Yavsc/Model/Messaging/BookQueryEvent.cs index 9d4ba316..ef8a7af4 100644 --- a/Yavsc.Api/Model/Messaging/BookQueryEvent.cs +++ b/Yavsc/Model/Messaging/BookQueryEvent.cs @@ -10,7 +10,7 @@ namespace Yavsc.Models.Messaging // Author: // Paul Schneider // -// Copyright (c) 2015 GNU GPL +// Copyright (c) 2015-2016 GNU GPL // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Lesser General Public License as published by @@ -44,6 +44,8 @@ public class BookQueryEvent: YaEvent /// The end date. [Display(Name="EndDate")] public DateTime EndDate { get; set; } + + public long CommandId { get; set; } } } diff --git a/Yavsc.Api/Model/Messaging/CircleEvent.cs b/Yavsc/Model/Messaging/CircleEvent.cs similarity index 100% rename from Yavsc.Api/Model/Messaging/CircleEvent.cs rename to Yavsc/Model/Messaging/CircleEvent.cs diff --git a/Yavsc.Api/Model/Messaging/Notification.cs b/Yavsc/Model/Messaging/Notification.cs similarity index 100% rename from Yavsc.Api/Model/Messaging/Notification.cs rename to Yavsc/Model/Messaging/Notification.cs diff --git a/Yavsc.Api/Model/Messaging/YaEvent.cs b/Yavsc/Model/Messaging/YaEvent.cs similarity index 100% rename from Yavsc.Api/Model/Messaging/YaEvent.cs rename to Yavsc/Model/Messaging/YaEvent.cs diff --git a/Yavsc.Api/Model/Relationship/Circle.cs b/Yavsc/Model/Relationship/Circle.cs similarity index 71% rename from Yavsc.Api/Model/Relationship/Circle.cs rename to Yavsc/Model/Relationship/Circle.cs index 6afc1813..3ff655b2 100644 --- a/Yavsc.Api/Model/Relationship/Circle.cs +++ b/Yavsc/Model/Relationship/Circle.cs @@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema; namespace Yavsc.Models { - public partial class Circle: ICircle { + public partial class Circle { [Key, DatabaseGeneratedAttribute(DatabaseGeneratedOption.Identity)] public long Id { get; set; } @@ -13,9 +13,9 @@ namespace Yavsc.Models public string OwnerId { get; set; } [ForeignKey("OwnerId")] - public virtual IApplicationUser Owner { get; set; } + public virtual ApplicationUser Owner { get; set; } [InverseProperty("Circle")] - public virtual IList Members { get; set; } + public virtual List Members { get; set; } } } diff --git a/Yavsc.Api/Model/Relationship/CircleMember.cs b/Yavsc/Model/Relationship/CircleMember.cs similarity index 100% rename from Yavsc.Api/Model/Relationship/CircleMember.cs rename to Yavsc/Model/Relationship/CircleMember.cs diff --git a/Yavsc.Api/Model/Relationship/Contact.cs b/Yavsc/Model/Relationship/Contact.cs similarity index 73% rename from Yavsc.Api/Model/Relationship/Contact.cs rename to Yavsc/Model/Relationship/Contact.cs index 5ba7ecf3..8666f25d 100644 --- a/Yavsc.Api/Model/Relationship/Contact.cs +++ b/Yavsc/Model/Relationship/Contact.cs @@ -1,18 +1,18 @@ -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - - -namespace Yavsc.Models -{ - public class Contact: IContact - { - [Required()] - public string UserId { get; set; } - - [Required()] - public string OwnerId { get; set; } - - [ForeignKeyAttribute("OwnerId")] - public virtual IApplicationUser Owner { get; set; } - } -} +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; + + +namespace Yavsc.Models +{ + public class Contact + { + [Required()] + public string UserId { get; set; } + + [Required()] + public string OwnerId { get; set; } + + [ForeignKeyAttribute("OwnerId")] + public virtual ApplicationUser Owner { get; set; } + } +} diff --git a/Yavsc.Api/Model/Relationship/Location.cs b/Yavsc/Model/Relationship/Location.cs similarity index 89% rename from Yavsc.Api/Model/Relationship/Location.cs rename to Yavsc/Model/Relationship/Location.cs index 8a38be33..27066ac7 100644 --- a/Yavsc.Api/Model/Relationship/Location.cs +++ b/Yavsc/Model/Relationship/Location.cs @@ -7,7 +7,7 @@ namespace Yavsc /// /// Position. /// - public class Position: IPosition + public class Position { /// /// The longitude. @@ -27,7 +27,7 @@ namespace Yavsc } - public class Location : Position, ILocation { + public class Location : Position { [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)] public long Id { get; set; } [Required(), diff --git a/Yavsc.Api/Model/Relationship/Tag.cs b/Yavsc/Model/Relationship/Tag.cs similarity index 100% rename from Yavsc.Api/Model/Relationship/Tag.cs rename to Yavsc/Model/Relationship/Tag.cs diff --git a/Yavsc.Api/Model/Relationship/Tagged.cs b/Yavsc/Model/Relationship/Tagged.cs similarity index 100% rename from Yavsc.Api/Model/Relationship/Tagged.cs rename to Yavsc/Model/Relationship/Tagged.cs diff --git a/Yavsc.Api/Model/Workflow/Activity.cs b/Yavsc/Model/Workflow/Activity.cs similarity index 95% rename from Yavsc.Api/Model/Workflow/Activity.cs rename to Yavsc/Model/Workflow/Activity.cs index dd474fbb..628903d1 100644 --- a/Yavsc.Api/Model/Workflow/Activity.cs +++ b/Yavsc/Model/Workflow/Activity.cs @@ -1,42 +1,40 @@ - -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Yavsc.Models.Market; - -namespace Yavsc.Models -{ - public class Activity - { - - [StringLength(512),Required,Key] - public string Code {get; set;} - /// - /// - /// - /// - [StringLength(512),Required()] - public string Name {get; set;} - - public string Description {get; set;} - /// - /// Name to associate to a performer in this activity domain - /// - /// - public string ActorDenomination {get; set;} - - public string Photo {get; set;} - - [InverseProperty("Context")] - public List Services { get; set; } - - /// - /// Moderation settings - /// - /// - string ModeratorGroupName { get; set; } - - - - } -} + +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using Yavsc.Models.Market; + +namespace Yavsc.Models +{ + public class Activity + { + + [StringLength(512),Required,Key] + public string Code {get; set;} + /// + /// + /// + /// + [StringLength(512),Required()] + public string Name {get; set;} + + public string Description {get; set;} + /// + /// Name to associate to a performer in this activity domain + /// + /// + public string ActorDenomination {get; set;} + + public string Photo {get; set;} + + [InverseProperty("Context")] + public List Services { get; set; } + + /// + /// Moderation settings + /// + /// + string ModeratorGroupName { get; set; } + + } +} diff --git a/Yavsc.Api/Model/Workflow/IRequisition.cs b/Yavsc/Model/Workflow/IRequisition.cs similarity index 100% rename from Yavsc.Api/Model/Workflow/IRequisition.cs rename to Yavsc/Model/Workflow/IRequisition.cs diff --git a/Yavsc.Api/Model/Workflow/PerformerProfile.cs b/Yavsc/Model/Workflow/PerformerProfile.cs similarity index 77% rename from Yavsc.Api/Model/Workflow/PerformerProfile.cs rename to Yavsc/Model/Workflow/PerformerProfile.cs index 2941b0f1..95f5ee18 100644 --- a/Yavsc.Api/Model/Workflow/PerformerProfile.cs +++ b/Yavsc/Model/Workflow/PerformerProfile.cs @@ -8,8 +8,8 @@ namespace Yavsc.Models.Workflow public class PerformerProfile { [Key] - public string PerfomerId { get; set; } - [ForeignKey("PerfomerId"),Display(Name="Performer")] + public string PerformerId { get; set; } + [ForeignKey("PerformerId"),Display(Name="Performer")] public virtual ApplicationUser Performer { get; set; } [Display(Name="Activity"),Required] @@ -21,10 +21,10 @@ namespace Yavsc.Models.Workflow RegularExpression(@"^[0-9]{9,14}$", ErrorMessage = "Only numbers are allowed here")] public string SIREN { get; set; } - public long OrganisationAddressId { get; set; } + public long OrganizationAddressId { get; set; } - [Required,Display(Name="Organisation address"),ForeignKey("OrganisationAddressId")] - public virtual Location OrganisationAddress { get; set; } + [Required,Display(Name="Organization address"),ForeignKey("OrganizationAddressId")] + public virtual Location OrganizationAddress { get; set; } [ForeignKey("ActivityCode"),Display(Name="Activity")] public virtual Activity Activity { get; set; } @@ -35,8 +35,8 @@ namespace Yavsc.Models.Workflow [Display(Name="Accept notifications from non-VIP users")] public bool AcceptPublicContact { get; set; } - [Display(Name="Allow my geolocatisation, nearby my clients")] - public bool AcceptGeoLocalisation { get; set; } + [Display(Name="Allow my geo-localization, nearby my clients")] + public bool AcceptGeoLocalization { get; set; } [Display(Name="Web site")] public string WebSite { get; set; } diff --git a/Yavsc.Api/Model/Workflow/Process/Action.cs b/Yavsc/Model/Workflow/Process/Action.cs similarity index 100% rename from Yavsc.Api/Model/Workflow/Process/Action.cs rename to Yavsc/Model/Workflow/Process/Action.cs diff --git a/Yavsc.Api/Model/Workflow/Process/Conjonction.cs b/Yavsc/Model/Workflow/Process/Conjonction.cs similarity index 100% rename from Yavsc.Api/Model/Workflow/Process/Conjonction.cs rename to Yavsc/Model/Workflow/Process/Conjonction.cs diff --git a/Yavsc.Api/Model/Workflow/Process/Disjonction.cs b/Yavsc/Model/Workflow/Process/Disjonction.cs similarity index 100% rename from Yavsc.Api/Model/Workflow/Process/Disjonction.cs rename to Yavsc/Model/Workflow/Process/Disjonction.cs diff --git a/Yavsc.Api/Model/Workflow/Process/InputValue.cs b/Yavsc/Model/Workflow/Process/InputValue.cs similarity index 100% rename from Yavsc.Api/Model/Workflow/Process/InputValue.cs rename to Yavsc/Model/Workflow/Process/InputValue.cs diff --git a/Yavsc.Api/Model/Workflow/Process/NamedRequisition.cs b/Yavsc/Model/Workflow/Process/NamedRequisition.cs similarity index 100% rename from Yavsc.Api/Model/Workflow/Process/NamedRequisition.cs rename to Yavsc/Model/Workflow/Process/NamedRequisition.cs diff --git a/Yavsc.Api/Model/Workflow/Process/Negation.cs b/Yavsc/Model/Workflow/Process/Negation.cs similarity index 100% rename from Yavsc.Api/Model/Workflow/Process/Negation.cs rename to Yavsc/Model/Workflow/Process/Negation.cs diff --git a/Yavsc.Api/Model/Workflow/Process/Rule.cs b/Yavsc/Model/Workflow/Process/Rule.cs similarity index 100% rename from Yavsc.Api/Model/Workflow/Process/Rule.cs rename to Yavsc/Model/Workflow/Process/Rule.cs diff --git a/Yavsc.Api/Model/Workflow/Projet.cs b/Yavsc/Model/Workflow/Projet.cs similarity index 100% rename from Yavsc.Api/Model/Workflow/Projet.cs rename to Yavsc/Model/Workflow/Projet.cs diff --git a/Yavsc.Api/Model/Workflow/Skill.cs b/Yavsc/Model/Workflow/Skill.cs similarity index 100% rename from Yavsc.Api/Model/Workflow/Skill.cs rename to Yavsc/Model/Workflow/Skill.cs diff --git a/Yavsc.Api/Model/Workflow/UserSkills.cs b/Yavsc/Model/Workflow/UserSkills.cs similarity index 100% rename from Yavsc.Api/Model/Workflow/UserSkills.cs rename to Yavsc/Model/Workflow/UserSkills.cs diff --git a/Yavsc.Api/Model/Workflow/hr.cs b/Yavsc/Model/Workflow/hr.cs similarity index 100% rename from Yavsc.Api/Model/Workflow/hr.cs rename to Yavsc/Model/Workflow/hr.cs diff --git a/Yavsc.Api/Model/Workflow/taskdeps.cs b/Yavsc/Model/Workflow/taskdeps.cs similarity index 100% rename from Yavsc.Api/Model/Workflow/taskdeps.cs rename to Yavsc/Model/Workflow/taskdeps.cs diff --git a/Yavsc.Api/Model/Workflow/tasks.cs b/Yavsc/Model/Workflow/tasks.cs similarity index 100% rename from Yavsc.Api/Model/Workflow/tasks.cs rename to Yavsc/Model/Workflow/tasks.cs diff --git a/Yavsc.Api/Model/Workflow/wrfiles.cs b/Yavsc/Model/Workflow/wrfiles.cs similarity index 100% rename from Yavsc.Api/Model/Workflow/wrfiles.cs rename to Yavsc/Model/Workflow/wrfiles.cs diff --git a/Yavsc.Api/Model/societe.com/CompanyInfo.cs b/Yavsc/Model/societe.com/CompanyInfo.cs similarity index 100% rename from Yavsc.Api/Model/societe.com/CompanyInfo.cs rename to Yavsc/Model/societe.com/CompanyInfo.cs diff --git a/Yavsc/Resources/Yavsc.Resources.YavscLocalisation.en.resx b/Yavsc/Resources/Yavsc.Resources.YavscLocalisation.en.resx index f0401f82..1d1d1187 100644 --- a/Yavsc/Resources/Yavsc.Resources.YavscLocalisation.en.resx +++ b/Yavsc/Resources/Yavsc.Resources.YavscLocalisation.en.resx @@ -251,9 +251,11 @@ Person Photo Photo updated + Please check your email to reset your password. Please confirm your new password Please fill in a body Please, fill in a reason + Posted Prefered date prestation diff --git a/Yavsc/Resources/Yavsc.Resources.YavscLocalisation.fr.resx b/Yavsc/Resources/Yavsc.Resources.YavscLocalisation.fr.resx index 471faea2..5254b319 100644 --- a/Yavsc/Resources/Yavsc.Resources.YavscLocalisation.fr.resx +++ b/Yavsc/Resources/Yavsc.Resources.YavscLocalisation.fr.resx @@ -132,8 +132,9 @@ Demander un devis Fichiers attachées Seuls les utilisateurs authentifiés peuvent accèder à cette information. - Author + Auteur disponible + Retour à la liste Panier Édition d'un article Suppression d'un article @@ -153,6 +154,7 @@ Formulaire de changement de pseudonyme (avatar, le nom publique de ce compte utilisateur ici) Modifiez les paramètres de votre compte Se connecter en utilisant + Choisissez ci-après votre activité principale S'il vous plait, choisissez une description. S'il vous plait, choisissez un titre. S'il vous plait, choisissez une date dans le futur. @@ -160,12 +162,16 @@ Chiffre Cercles Action sur click + Cliquez ici pour vous identifier + Commentaire Consultant Contactez un préstataire + Contenu Nombre La convertion de '{0}' en 'double' a été impossible. Créer + Créer un nouvel article Créer un nouveau compte Crédits Demande de rendez-vous @@ -190,20 +196,23 @@ Date de fin Heure de fin e-mail + Saisissez votre email. entrées Estimer Devis non trouvé Demande de devis - Date de l'évennement + Date de l'évennement Page web de l'événement Base de données éxistante Inscriptions externes Veuillez, s'il vous plait, utiliser une date future. Saisissez votre demande de rendez-vous Contenu à accès restreint - - Mot de passe oublié + Mot de passe perdu? + Confirmation mot de passe perdu. provenant de + L'envoi du message push a échoué + Message push envoyé Google n'a pas pu identifier ce lieu Agenda Google Erreur Google : {0} @@ -235,6 +244,7 @@ Membres Votre message a été envoyé Date minimale du rendez-vous + Modifié Modifier Modifier les paramètres @@ -266,9 +276,12 @@ Personne Photo Photo mise à jour + S'il vous plait + S'il vous plait, veuillez verifier votre boite au lettres, pour pouvoir ré-initialiser votre mot de passe. S'il vous plait, veuillez confirmer votre nouveau mot de passe. S'il vous plait, saisissez un corps de message S'il vous plait, saisissez une réson, un sujet pour votre message + Veuillez s'il vous plait utiliser le lien suivant pour ré-initialiser votre mot de passe: Posté Date souhaitée Lieu de la présation: {0}.\n @@ -278,6 +291,7 @@ prestation Identifiant du fournisseur Nom du fournisseur + Cote Lire la suite ... raison S'inscrire @@ -289,7 +303,8 @@ Supprimer Supprimer mon profile professionnel Rôle - Ré-initialiser votre mot de passe + Ré-initialiser votre mot de passe + Confirmation de ré-initialiser du mot de passe Rôle créé Nom du rôle Save these settings @@ -340,6 +355,9 @@ Vous devez vous authentifier pour pouvoir demander un devis à un préstataire. Vous n'êtes pas administrateur + Votre demande de rendez-vous + Votre mote de passe a été mis à jour. + Vos Devis Votre activité Votre besoin @@ -348,5 +366,4 @@ Vos publications Votre profile Votre messge a été envoyé - diff --git a/Yavsc/Startup/Startup.FileServer.cs b/Yavsc/Startup/Startup.FileServer.cs index 8f83ea40..b5f6db2a 100644 --- a/Yavsc/Startup/Startup.FileServer.cs +++ b/Yavsc/Startup/Startup.FileServer.cs @@ -14,16 +14,20 @@ namespace Yavsc public void ConfigureFileServerApp(IApplicationBuilder app, SiteSettings siteSettings, IHostingEnvironment env) { - app.UseFileServer(new FileServerOptions() - { - FileProvider = new PhysicalFileProvider( - Path.Combine( + var rootPath = Path.Combine( env.WebRootPath, // TODO: add a ressource serveur id here, // or remove the blog entry id usage, to use the userid instead // and an user defined optional subdir. siteSettings.UserFiles.DirName - )), + ); + var rootInfo = new DirectoryInfo(rootPath); + if (!rootInfo.Exists) rootInfo.Create(); + + + app.UseFileServer(new FileServerOptions() + { + FileProvider = new PhysicalFileProvider(rootPath), RequestPath = new PathString("/" + siteSettings.UserFiles.DirName), EnableDirectoryBrowsing = false }); diff --git a/Yavsc/Startup/Startup.OAuth.cs b/Yavsc/Startup/Startup.OAuth.cs index 20a8bfb5..2af80caa 100644 --- a/Yavsc/Startup/Startup.OAuth.cs +++ b/Yavsc/Startup/Startup.OAuth.cs @@ -29,7 +29,6 @@ namespace Yavsc public static FacebookOptions FacebookAppOptions { get; private set; } public static OAuthAuthorizationServerOptions OAuthServerAppOptions { get; private set; } - public static OAuthOptions OAuthClientOptions { get; set; } public static YavscGoogleOptions YavscGoogleAppOptions { get; private set; } public static MonoDataProtectionProvider ProtectionProvider { get; private set; } diff --git a/Yavsc/TODO.md b/Yavsc/TODO.md index c96de9c8..3af6da76 100644 --- a/Yavsc/TODO.md +++ b/Yavsc/TODO.md @@ -7,12 +7,13 @@ * Paiement client * Acces (publique) aux Blogs * Login Twitter -* Signature +* Signature de contrat ### Jalon 2 * Notifications commande * Saisie du devis sur commande * Aide à la rencontre +* activités secondaires ### Jalon 3 * Arrhes diff --git a/Yavsc/Views/Account/AccessDenied.cshtml b/Yavsc/Views/Account/AccessDenied.cshtml new file mode 100644 index 00000000..f52b5e98 --- /dev/null +++ b/Yavsc/Views/Account/AccessDenied.cshtml @@ -0,0 +1,17 @@ +@{ + ViewData["Title"] = SR["Forbidden"]; +} + +L'accès à cette ressource est protégé. + +@if (ViewBag.UserIsSignedIn) { + +@:Vous ne possédez pas les droits suffisants pour y acceder. + +@SR["Login"] avec un autre compte + +} +else { + + @SR["Login"] +} \ No newline at end of file diff --git a/Yavsc/Views/Account/Forbidden.cshtml b/Yavsc/Views/Account/Forbidden.cshtml deleted file mode 100644 index 6c24a646..00000000 --- a/Yavsc/Views/Account/Forbidden.cshtml +++ /dev/null @@ -1,6 +0,0 @@ -@{ - ViewData["Title"] = SR["Forbidden"]; -} - - -@SR["Login"] \ No newline at end of file diff --git a/Yavsc/Views/Account/ForgotPassword.cshtml b/Yavsc/Views/Account/ForgotPassword.cshtml index b7b27c8d..93e0276b 100755 --- a/Yavsc/Views/Account/ForgotPassword.cshtml +++ b/Yavsc/Views/Account/ForgotPassword.cshtml @@ -1,12 +1,12 @@ @model ForgotPasswordViewModel @{ - ViewData["Title"] = "Forgot your password?"; + ViewData["Title"] = SR["Forgot your password?"]; } -

@ViewData["Title"].

+

@ViewData["Title"]

-

Enter your email.

+

@SR["Enter your email."]

@@ -18,7 +18,7 @@
- +
diff --git a/Yavsc/Views/Account/ForgotPasswordConfirmation.cshtml b/Yavsc/Views/Account/ForgotPasswordConfirmation.cshtml index c7296dea..b2fbb50c 100755 --- a/Yavsc/Views/Account/ForgotPasswordConfirmation.cshtml +++ b/Yavsc/Views/Account/ForgotPasswordConfirmation.cshtml @@ -1,8 +1,8 @@ @{ - ViewData["Title"] = "Forgot Password Confirmation"; + ViewData["Title"] = @SR["Forgot Password Confirmation."]; }

@ViewData["Title"].

- Please check your email to reset your password. + @SR["PleaseCheckYourEmail"]

diff --git a/Yavsc/Views/Account/ResetPasswordConfirmation.cshtml b/Yavsc/Views/Account/ResetPasswordConfirmation.cshtml index e938a208..ac232439 100755 --- a/Yavsc/Views/Account/ResetPasswordConfirmation.cshtml +++ b/Yavsc/Views/Account/ResetPasswordConfirmation.cshtml @@ -1,8 +1,8 @@ @{ - ViewData["Title"] = "Reset password confirmation"; + ViewData["Title"] = SR["Reset password confirmation"]; }

@ViewData["Title"].

- Your password has been reset. Please Click here to log in. + @SR["Your password has been reset."] @SR["Please"] @SR["Click here to log in"].

diff --git a/Yavsc/Views/Blogspot/Details.cshtml b/Yavsc/Views/Blogspot/Details.cshtml index 57e1f2ab..41b240d5 100644 --- a/Yavsc/Views/Blogspot/Details.cshtml +++ b/Yavsc/Views/Blogspot/Details.cshtml @@ -9,13 +9,13 @@
- @Html.DisplayNameFor(model => model.title) + @SR[Html.DisplayNameFor(model => model.title)]
@Html.DisplayFor(model => model.title)
- @Html.DisplayNameFor(model => model.photo) + @SR[Html.DisplayNameFor(model => model.photo)]
@Html.DisplayFor(model => model.photo) @@ -27,34 +27,34 @@ @Model.Author.UserName
- Contenu + @SR["Content"]
- @Html.DisplayNameFor(model => model.modified) + @SR[Html.DisplayNameFor(model => model.modified)]
@Html.DisplayFor(model => model.modified)
- @Html.DisplayNameFor(model => model.posted) + @SR[Html.DisplayNameFor(model => model.posted)]
@Html.DisplayFor(model => model.posted)
- @Html.DisplayNameFor(model => model.rate) + @SR[Html.DisplayNameFor(model => model.rate)]
@Html.DisplayFor(model => model.rate)
- @Html.DisplayNameFor(model => model.visible) + @SR[Html.DisplayNameFor(model => model.visible)]
@Html.DisplayFor(model => model.visible) @@ -64,10 +64,10 @@ diff --git a/Yavsc/Views/Blogspot/Index.cshtml b/Yavsc/Views/Blogspot/Index.cshtml index 40d0f735..d30b34b7 100644 --- a/Yavsc/Views/Blogspot/Index.cshtml +++ b/Yavsc/Views/Blogspot/Index.cshtml @@ -7,30 +7,18 @@

Index

@ViewData["StatusMessage"]

- Create New + @SR["Create a new article"]

- - - - @@ -38,34 +26,29 @@ @foreach (var item in Model) { - - - - -
- @SR["Author"] - - @Html.DisplayNameFor(model => model.title) - - @Html.DisplayNameFor(model => model.modified) + @SR[Html.DisplayNameFor(model => model.title)] - @Html.DisplayNameFor(model => model.photo) - - @Html.DisplayNameFor(model => model.posted) - - @Html.DisplayNameFor(model => model.rate) + @SR["Author"] - @Html.DisplayNameFor(model => model.visible) + @SR["Date"]
- @item.Author?.UserName - + @Html.DisplayFor(modelItem => item.photo) @item.title - @Html.DisplayFor(modelItem => item.modified) + @item.Author.UserName - @Html.DisplayFor(modelItem => item.photo) + + posté le @item.posted.ToString("dddd d MMM yyyy à H:mm") + @if ((item.modified - item.posted).Minutes > 10) + {  + @:- Modifié le @item.modified.ToString("dddd d MMM yyyy à H:mm") + } + - @Html.DisplayFor(modelItem => item.posted) - - @Html.DisplayFor(modelItem => item.rate) - - @Html.DisplayFor(modelItem => item.visible) - + diff --git a/Yavsc/Views/Command/CommandConfirmation.cshtml b/Yavsc/Views/Command/CommandConfirmation.cshtml new file mode 100644 index 00000000..2540b909 --- /dev/null +++ b/Yavsc/Views/Command/CommandConfirmation.cshtml @@ -0,0 +1,30 @@ +@model BookQuery +@using Yavsc.Models.Google.Messaging +@{ + ViewData["Title"] = SR["Command confirmation"]+" "+SR[Model.PerformerProfile.ActivityCode]; +} +

@ViewData["Title"]

+
+

@SR["Your book query"]

+
+ : @Html.DisplayFor(m => m.EventDate) +
+ + : @Html.DisplayFor(m => m.Location) +
+ + @if (ViewBag.GooglePayload !=null) + { + @if (ViewBag.GooglePayload.success>0) { +

@SR["GCM Notifications sent"]

+ } + else { + if (ViewBag.GooglePayload.failure>0) + { +

@SR["GCM Notification sending failed"]

+ } + } + } +
+ + diff --git a/Yavsc/Views/Estimate/Create.cshtml b/Yavsc/Views/Estimate/Create.cshtml index 9e09cf20..caf8a9aa 100644 --- a/Yavsc/Views/Estimate/Create.cshtml +++ b/Yavsc/Views/Estimate/Create.cshtml @@ -1,4 +1,4 @@ -@model Yavsc.Models.Estimate +@model Estimate @{ ViewData["Title"] = SR["Estimate"]; diff --git a/Yavsc/Views/Estimate/Delete.cshtml b/Yavsc/Views/Estimate/Delete.cshtml index 9165fdc3..17c57de7 100644 --- a/Yavsc/Views/Estimate/Delete.cshtml +++ b/Yavsc/Views/Estimate/Delete.cshtml @@ -1,4 +1,4 @@ -@model Yavsc.Models.Estimate +@model Estimate @{ ViewData["Title"] = "Delete"; diff --git a/Yavsc/Views/Estimate/Details.cshtml b/Yavsc/Views/Estimate/Details.cshtml index 79293514..384dab3b 100644 --- a/Yavsc/Views/Estimate/Details.cshtml +++ b/Yavsc/Views/Estimate/Details.cshtml @@ -1,4 +1,4 @@ -@model Yavsc.Models.Estimate +@model Estimate @{ ViewData["Title"] = "Details"; diff --git a/Yavsc/Views/Estimate/Edit.cshtml b/Yavsc/Views/Estimate/Edit.cshtml index 2f996506..2e14961d 100644 --- a/Yavsc/Views/Estimate/Edit.cshtml +++ b/Yavsc/Views/Estimate/Edit.cshtml @@ -1,4 +1,4 @@ -@model Yavsc.Models.Estimate +@model Estimate @{ ViewData["Title"] = "Edit"; diff --git a/Yavsc/Views/Estimate/Index.cshtml b/Yavsc/Views/Estimate/Index.cshtml index 4ef300a2..f7ed5930 100644 --- a/Yavsc/Views/Estimate/Index.cshtml +++ b/Yavsc/Views/Estimate/Index.cshtml @@ -1,4 +1,4 @@ -@model IEnumerable +@model IEnumerable @{ ViewData["Title"] = SR["My estimates"]; diff --git a/Yavsc/Views/FrontOffice/Book.cshtml b/Yavsc/Views/FrontOffice/Book.cshtml index 892bd66a..695d0848 100644 --- a/Yavsc/Views/FrontOffice/Book.cshtml +++ b/Yavsc/Views/FrontOffice/Book.cshtml @@ -8,7 +8,7 @@ @foreach (var profile in Model) { await Html.RenderPartialAsync("_PerformerPartial", profile) ;
- +
} diff --git a/Yavsc/Views/Home/Index.cshtml b/Yavsc/Views/Home/Index.cshtml index 49fb3a9f..dd32853d 100755 --- a/Yavsc/Views/Home/Index.cshtml +++ b/Yavsc/Views/Home/Index.cshtml @@ -11,7 +11,7 @@
- ASP.NET + ASP.NET

Invitez un groupe musical à animer votre événement

@@ -23,7 +23,7 @@
- Visual Studio + Visual Studio

Organisez un concert.

@@ -35,7 +35,7 @@
- Package Management + Package Management

Offrez-vous un anniversaire, un mariage Hip Hop

@@ -48,7 +48,7 @@

- Microsoft Azure + Microsoft Azure

Invitez votre chanteur à la fête

diff --git a/Yavsc/Views/Manage/SetActivity.cshtml b/Yavsc/Views/Manage/SetActivity.cshtml index 80e6f4dd..5eaf299c 100644 --- a/Yavsc/Views/Manage/SetActivity.cshtml +++ b/Yavsc/Views/Manage/SetActivity.cshtml @@ -23,10 +23,41 @@ @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } @@ -63,7 +114,7 @@ @{ await Html.RenderPartialAsync("_PerformerPartial", Model) ; }
-

Choose below your main activity:

+

@SR["Choose below your main activity"]:

@@ -92,11 +143,11 @@
- +
- + - +
@@ -146,17 +197,17 @@
- +
- + - +
- @Html.Hidden("OrganisationAddress.Latitude") - @Html.Hidden("OrganisationAddress.Longitude") - @Html.Hidden("PerfomerId") + @Html.Hidden("OrganizationAddress.Latitude") + @Html.Hidden("OrganizationAddress.Longitude") + @Html.Hidden("PerformerId")
diff --git a/Yavsc/Views/SIRENExceptions/Create.cshtml b/Yavsc/Views/SIRENExceptions/Create.cshtml new file mode 100644 index 00000000..839cb5a9 --- /dev/null +++ b/Yavsc/Views/SIRENExceptions/Create.cshtml @@ -0,0 +1,22 @@ +@model Yavsc.Models.Billing.ExceptionSIREN + + +
+
+

Exception SIREN

+
+
+
+ @Html.TextBox("SIREN") +
+
+ +
+
+
+
+
+ + diff --git a/Yavsc/Views/SIRENExceptions/Delete.cshtml b/Yavsc/Views/SIRENExceptions/Delete.cshtml new file mode 100644 index 00000000..54b04c84 --- /dev/null +++ b/Yavsc/Views/SIRENExceptions/Delete.cshtml @@ -0,0 +1,31 @@ +@model Yavsc.Models.Billing.ExceptionSIREN + +@{ + Layout = null; +} + + + + + + + Delete + + + +

Are you sure you want to delete this?

+
+

ExceptionSIREN

+
+
+
+ +
+
+ | + Back to List +
+
+
+ + diff --git a/Yavsc/Views/SIRENExceptions/Details.cshtml b/Yavsc/Views/SIRENExceptions/Details.cshtml new file mode 100644 index 00000000..bc575deb --- /dev/null +++ b/Yavsc/Views/SIRENExceptions/Details.cshtml @@ -0,0 +1,27 @@ +@model Yavsc.Models.Billing.ExceptionSIREN + +@{ + Layout = null; +} + + + + + + + Details + + + +
+

ExceptionSIREN

+
+
+
+
+

+ Edit | + Back to List +

+ + diff --git a/Yavsc/Views/SIRENExceptions/Edit.cshtml b/Yavsc/Views/SIRENExceptions/Edit.cshtml new file mode 100644 index 00000000..dc9c2d95 --- /dev/null +++ b/Yavsc/Views/SIRENExceptions/Edit.cshtml @@ -0,0 +1,39 @@ +@model Yavsc.Models.Billing.ExceptionSIREN + +@{ + Layout = null; +} + + + + + + + Edit + + + +
+
+

ExceptionSIREN

+
+
+ @Html.DisplayFor(model => model.SIREN) : + +
+
+ @Html.InputFor(model => model.SIREN) +
+
+ +
+
+
+
+ + + + + diff --git a/Yavsc/Views/SIRENExceptions/Index.cshtml b/Yavsc/Views/SIRENExceptions/Index.cshtml new file mode 100644 index 00000000..26668904 --- /dev/null +++ b/Yavsc/Views/SIRENExceptions/Index.cshtml @@ -0,0 +1,21 @@ +@model IEnumerable + +

+ Create New +

+ + + + + +@foreach (var item in Model) { + + + + +} +
Exceptions à la validation des code SIREN
@item.SIREN + Edit | + Details | + Delete +
diff --git a/Yavsc/Views/Shared/SignIn.cshtml b/Yavsc/Views/Shared/SignIn.cshtml index 468b07fe..1583ffb4 100644 --- a/Yavsc/Views/Shared/SignIn.cshtml +++ b/Yavsc/Views/Shared/SignIn.cshtml @@ -45,7 +45,7 @@ @SR["Register as a new user"]?

- @SR["Forgot your password"]? + @SR["Forgot your password?"]

diff --git a/Yavsc/Views/Shared/_Layout.cshtml b/Yavsc/Views/Shared/_Layout.cshtml index 97d70fa5..2013471c 100755 --- a/Yavsc/Views/Shared/_Layout.cshtml +++ b/Yavsc/Views/Shared/_Layout.cshtml @@ -39,12 +39,14 @@ + @SiteSettings.Value.Title
diff --git a/Yavsc/Views/Shared/_PerformerPartial.cshtml b/Yavsc/Views/Shared/_PerformerPartial.cshtml index 243b696b..568f10dd 100644 --- a/Yavsc/Views/Shared/_PerformerPartial.cshtml +++ b/Yavsc/Views/Shared/_PerformerPartial.cshtml @@ -1,8 +1,10 @@ @model PerformerProfile
- @Model.Performer?.UserName (rating: @Model.Rate%) + @if (Model.Performer != null) { +
    +
  • @Model.Performer.UserName (rating: @Model.Rate%)
    • @if (Model.MinDailyCost != null) {
  • @SR["MinDailyCost"]: @Model.MinDailyCost€
    • } @@ -29,4 +31,5 @@ }
+ }
diff --git a/Yavsc/project.json b/Yavsc/project.json index 9d4c91de..c4cb5504 100755 --- a/Yavsc/project.json +++ b/Yavsc/project.json @@ -45,7 +45,6 @@ "defaultNamespace": "Yavsc" }, "dependencies": { - "Yavsc.Api": "1.0.0", "EntityFramework.Commands": "7.0.0-rc1-*", "EntityFramework.Core": "7.0.0-rc1-*", "EntityFramework.MicrosoftSqlServer": "7.0.0-rc1-*", @@ -105,7 +104,8 @@ "PayPalButtonManagerSDK": "2.10.109", "Microsoft.AspNet.Authentication.OAuth": "1.0.0-rc1-final", "Microsoft.AspNet.Mvc.Formatters.Json": "6.0.0-rc1-final", - "Microsoft.AspNet.OWin": "1.0.0-rc1-final" + "Microsoft.AspNet.OWin": "1.0.0-rc1-final", + "System.Json": "4.0.20126.16343" }, "commands": { "web": "Microsoft.AspNet.Server.Kestrel --server.urls http://*:5000", @@ -141,4 +141,4 @@ "prepublish": "gulp min", "postpublish": "echo \" (cd ../build && . ./postPublish.sh) # to push in prod.\"" } -} +} \ No newline at end of file diff --git a/Yavsc/project.lock.json b/Yavsc/project.lock.json index 966a543d..1b32f93b 100644 --- a/Yavsc/project.lock.json +++ b/Yavsc/project.lock.json @@ -2472,7 +2472,7 @@ "lib/net451/MimeKit.dll": {} } }, - "Newtonsoft.Json/9.0.1": { + "Newtonsoft.Json/7.0.1": { "type": "package", "compile": { "lib/net45/Newtonsoft.Json.dll": {} @@ -2809,21 +2809,6 @@ "lib/WebGrease.dll": {} } }, - "Yavsc.Api/1.0.0": { - "type": "project", - "framework": ".NETFramework,Version=v4.5.1", - "dependencies": { - "EntityFramework.Commands": "7.0.0-rc1", - "EntityFramework.Core": "7.0.0-rc1", - "EntityFramework.MicrosoftSqlServer": "7.0.0-rc1", - "EntityFramework.Relational": "7.0.0-rc1", - "EntityFramework7.Npgsql": "3.1.0", - "EntityFramework7.Npgsql.Design": "3.1.0", - "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-rc1", - "Newtonsoft.Json": "9.0.1", - "System.Json": "4.0.20126.16343" - } - }, "Zlib.Portable.Signed/1.11.0": { "type": "package", "compile": { @@ -5304,7 +5289,7 @@ "lib/net451/MimeKit.dll": {} } }, - "Newtonsoft.Json/9.0.1": { + "Newtonsoft.Json/7.0.1": { "type": "package", "compile": { "lib/net45/Newtonsoft.Json.dll": {} @@ -5641,21 +5626,6 @@ "lib/WebGrease.dll": {} } }, - "Yavsc.Api/1.0.0": { - "type": "project", - "framework": ".NETFramework,Version=v4.5.1", - "dependencies": { - "EntityFramework.Commands": "7.0.0-rc1", - "EntityFramework.Core": "7.0.0-rc1", - "EntityFramework.MicrosoftSqlServer": "7.0.0-rc1", - "EntityFramework.Relational": "7.0.0-rc1", - "EntityFramework7.Npgsql": "3.1.0", - "EntityFramework7.Npgsql.Design": "3.1.0", - "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-rc1", - "Newtonsoft.Json": "9.0.1", - "System.Json": "4.0.20126.16343" - } - }, "Zlib.Portable.Signed/1.11.0": { "type": "package", "compile": { @@ -8136,7 +8106,7 @@ "lib/net451/MimeKit.dll": {} } }, - "Newtonsoft.Json/9.0.1": { + "Newtonsoft.Json/7.0.1": { "type": "package", "compile": { "lib/net45/Newtonsoft.Json.dll": {} @@ -8473,21 +8443,6 @@ "lib/WebGrease.dll": {} } }, - "Yavsc.Api/1.0.0": { - "type": "project", - "framework": ".NETFramework,Version=v4.5.1", - "dependencies": { - "EntityFramework.Commands": "7.0.0-rc1", - "EntityFramework.Core": "7.0.0-rc1", - "EntityFramework.MicrosoftSqlServer": "7.0.0-rc1", - "EntityFramework.Relational": "7.0.0-rc1", - "EntityFramework7.Npgsql": "3.1.0", - "EntityFramework7.Npgsql.Design": "3.1.0", - "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-rc1", - "Newtonsoft.Json": "9.0.1", - "System.Json": "4.0.20126.16343" - } - }, "Zlib.Portable.Signed/1.11.0": { "type": "package", "compile": { @@ -8500,10 +8455,6 @@ } }, "libraries": { - "Yavsc.Api/1.0.0": { - "type": "project", - "path": "../Yavsc.Api/project.json" - }, "Antlr/3.4.1.9004": { "type": "package", "sha512": "c1S+HBE+KYA5EBxtn25LEK02hHPH/tDQ6RviUTTCJpZIPoputtn8ArsQJy9lVJWZOnw37ufByO2Fmf1M8wpr8Q==", @@ -10482,9 +10433,9 @@ "MimeKit.nuspec" ] }, - "Newtonsoft.Json/9.0.1": { + "Newtonsoft.Json/7.0.1": { "type": "package", - "sha512": "U82mHQSKaIk+lpSVCbWYKNavmNH1i5xrExDEquU1i6I5pV6UMOqRnJRSlKO3cMPfcpp0RgDY+8jUXHdQ4IfXvw==", + "sha512": "q3V4KLetMLnt1gpAVWgtXnHjKs0UG/RalBc29u2ZKxd5t5Ze4JBL5WiiYIklJyK/5CRiIiNwigVQUo0FgbsuWA==", "files": [ "lib/net20/Newtonsoft.Json.dll", "lib/net20/Newtonsoft.Json.xml", @@ -10494,14 +10445,12 @@ "lib/net40/Newtonsoft.Json.xml", "lib/net45/Newtonsoft.Json.dll", "lib/net45/Newtonsoft.Json.xml", - "lib/netstandard1.0/Newtonsoft.Json.dll", - "lib/netstandard1.0/Newtonsoft.Json.xml", "lib/portable-net40+sl5+wp80+win8+wpa81/Newtonsoft.Json.dll", "lib/portable-net40+sl5+wp80+win8+wpa81/Newtonsoft.Json.xml", - "lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.dll", - "lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.xml", - "Newtonsoft.Json.9.0.1.nupkg", - "Newtonsoft.Json.9.0.1.nupkg.sha512", + "lib/portable-net45+wp80+win8+wpa81+dnxcore50/Newtonsoft.Json.dll", + "lib/portable-net45+wp80+win8+wpa81+dnxcore50/Newtonsoft.Json.xml", + "Newtonsoft.Json.7.0.1.nupkg", + "Newtonsoft.Json.7.0.1.nupkg.sha512", "Newtonsoft.Json.nuspec", "tools/install.ps1" ] @@ -10531,6 +10480,7 @@ "sha512": "OseTFniKmyp76mEzOBwIKGBRS5eMoYNkMKaMXOpxx9jv88+b6mh1rSaw43vjBOItNhaLFG3d0a20PfHyibH5sw==", "files": [ "lib/net40/Owin.dll", + "Owin.1.0.0.nupkg", "Owin.1.0.0.nupkg.sha512", "Owin.nuspec" ] @@ -11409,7 +11359,6 @@ }, "projectFileDependencyGroups": { "": [ - "Yavsc.Api >= 1.0.0", "EntityFramework.Commands >= 7.0.0-rc1-*", "EntityFramework.Core >= 7.0.0-rc1-*", "EntityFramework.MicrosoftSqlServer >= 7.0.0-rc1-*", @@ -11469,7 +11418,8 @@ "PayPalButtonManagerSDK >= 2.10.109", "Microsoft.AspNet.Authentication.OAuth >= 1.0.0-rc1-final", "Microsoft.AspNet.Mvc.Formatters.Json >= 6.0.0-rc1-final", - "Microsoft.AspNet.OWin >= 1.0.0-rc1-final" + "Microsoft.AspNet.OWin >= 1.0.0-rc1-final", + "System.Json >= 4.0.20126.16343" ], "DNX,Version=v4.5.1": [] } diff --git a/Yavsc/wwwroot/css/site.css b/Yavsc/wwwroot/css/site.css index 65a2cedb..31770497 100755 --- a/Yavsc/wwwroot/css/site.css +++ b/Yavsc/wwwroot/css/site.css @@ -15,13 +15,12 @@ textarea { /* Set widths on image and video, since otherwise they use their native resolution */ -img, -video { - max-width: 100%; -} /* .navbar-reac */ /* Carousel */ +.carousel, .carousel img { + min-height: 15em; +} .carousel-caption p { font-family: "jubilat"; font-weight: 600; diff --git a/Yavsc/wwwroot/images/booking/concert_b2.jpg b/Yavsc/wwwroot/images/booking/concert_b2.jpg new file mode 100644 index 00000000..13aa0410 Binary files /dev/null and b/Yavsc/wwwroot/images/booking/concert_b2.jpg differ diff --git a/Yavsc/wwwroot/images/booking/dj_b2.jpg b/Yavsc/wwwroot/images/booking/dj_b2.jpg new file mode 100644 index 00000000..6e5f1b5b Binary files /dev/null and b/Yavsc/wwwroot/images/booking/dj_b2.jpg differ diff --git a/Yavsc/wwwroot/images/booking/groupe_b2.jpg b/Yavsc/wwwroot/images/booking/groupe_b2.jpg new file mode 100644 index 00000000..c44ce420 Binary files /dev/null and b/Yavsc/wwwroot/images/booking/groupe_b2.jpg differ diff --git a/Yavsc/wwwroot/images/booking/mike_b2.jpg b/Yavsc/wwwroot/images/booking/mike_b2.jpg new file mode 100644 index 00000000..6267b069 Binary files /dev/null and b/Yavsc/wwwroot/images/booking/mike_b2.jpg differ diff --git a/Yavsc/wwwroot/images/booking/musique_b2.jpg b/Yavsc/wwwroot/images/booking/musique_b2.jpg new file mode 100644 index 00000000..4dd6753e Binary files /dev/null and b/Yavsc/wwwroot/images/booking/musique_b2.jpg differ diff --git a/build/approot/src/Yavsc/Controllers/AccountController.cs b/build/approot/src/Yavsc/Controllers/AccountController.cs index 269334b2..dbbd6fba 100644 --- a/build/approot/src/Yavsc/Controllers/AccountController.cs +++ b/build/approot/src/Yavsc/Controllers/AccountController.cs @@ -325,7 +325,7 @@ namespace Yavsc.Controllers { if (ModelState.IsValid) { - var user = await _userManager.FindByNameAsync(model.Email); + var user = await _userManager.FindByEMailAsync(model.Email); if (user == null || !(await _userManager.IsEmailConfirmedAsync(user))) { // Don't reveal that the user does not exist or is not confirmed diff --git a/sendmsg/NuGet.Config b/sendmsg/NuGet.Config new file mode 100644 index 00000000..e80222c1 --- /dev/null +++ b/sendmsg/NuGet.Config @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/sendmsg/Program.cs b/sendmsg/Program.cs new file mode 100644 index 00000000..48986dc5 --- /dev/null +++ b/sendmsg/Program.cs @@ -0,0 +1,69 @@ +using System; +using System.Net.Http; +using System.Net.Http.Headers; +using System.Text; +using System.Threading.Tasks; +using Newtonsoft.Json.Linq; + +namespace MessageSender +{ + public class Program + { + public const string API_KEY = "AIzaSyDwPlu2ky9AoPwDvThoXxJwqiPq-Tc8p8k"; + public const string MESSAGE = "Hello, Xamarin!"; + + static void Main(string[] args) + { + var reg_id= "eRSVBXTxiyk:APA91bE1NRs6LWBq9O3ACBV5g4B8D2ANwS9UjpPkwYFYWtv6NeTuSzBb6ZBhOFx_gbh9AbSgZ7uHETOPp26ahhJY74i55f7gULgaQR7-MV5CeaBYANfKcVgqQ5GTsb2zMCS_2MIUVy3Q"; + var jGcmData = new JObject(); + var jNotification = new JObject(); + jNotification.Add("body","a body"); + jNotification.Add("title",MESSAGE); + jNotification.Add("icon","icon"); + jGcmData.Add("to",reg_id); + jGcmData.Add("notification",jNotification); + +/* "to" : "bk3RNwTe3H0:CI2k_HHwgIpoDKCIZvvDMExUdFQ3P1...", + "notification" : { + "body" : "great match!", + "title" : "Portugal vs. Denmark", + "icon" : "myicon" + } + var jData = new JObject(); + jData.Add("message", MESSAGE); + jGcmData.Add("to", "/topics/global"); + jGcmData.Add("data", jData); + */ + + + var url = new Uri("https://gcm-http.googleapis.com/gcm/send"); + try + { + using (var client = new HttpClient()) + { + client.DefaultRequestHeaders.Accept.Add( + new MediaTypeWithQualityHeaderValue("application/json")); + + client.DefaultRequestHeaders.TryAddWithoutValidation( + "Authorization", "key=" + API_KEY); + + Task.WaitAll(client.PostAsync(url, + new StringContent(jGcmData.ToString(), Encoding.UTF8, "application/json")) + .ContinueWith(response => + { + Task.Run ( async () => { + var content = await response.Result.Content.ReadAsStringAsync(); + Console.WriteLine(content); + }); + Console.WriteLine(">Message sent: check the client device notification tray."); + })); + } + } + catch (Exception e) + { + Console.WriteLine("Unable to send GCM message:"); + Console.Error.WriteLine(e.StackTrace); + } + } + } +} diff --git a/sendmsg/project.json b/sendmsg/project.json new file mode 100644 index 00000000..b749afe9 --- /dev/null +++ b/sendmsg/project.json @@ -0,0 +1,28 @@ +{ + "version": "1.0.0-*", + "description": "ConsoleApplication Console Application", + "authors": [ + "" + ], + "tags": [ + "" + ], + "projectUrl": "", + "licenseUrl": "", + "compilationOptions": { + "emitEntryPoint": true + }, + "tooling": { + "defaultNamespace": "ConsoleApplication" + }, + "dependencies": { + "Newtonsoft.Json": "9.0.1", + "System.Net.Http": "4.1.0" + }, + "commands": { + "ConsoleApplication": "ConsoleApplication" + }, + "frameworks": { + "dnx451": {} + } +} diff --git a/testOauthClient/Controllers/HomeController.cs b/testOauthClient/Controllers/HomeController.cs index 09471c4d..b9f94e15 100755 --- a/testOauthClient/Controllers/HomeController.cs +++ b/testOauthClient/Controllers/HomeController.cs @@ -1,15 +1,22 @@ using System; +using System.Json; using System.Net.Http; using System.Net.Http.Headers; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNet.Mvc; +using Microsoft.Extensions.Logging; using Yavsc.Helpers; namespace testOauthClient.Controllers { public class HomeController : Controller { + ILogger _logger; + public HomeController(ILoggerFactory loggerFactory) + { + _logger=loggerFactory.CreateLogger(); + } [HttpGet] public IActionResult Index() { @@ -18,10 +25,11 @@ namespace testOauthClient.Controllers [HttpPost] public async Task GetUserInfo(CancellationToken cancellationToken) { - using (var client = new HttpClient()) { + using (var client = new HttpClient()) + { var request = new HttpRequestMessage(HttpMethod.Get, "http://dev.pschneider.fr/api/me"); request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken); - + var response = await client.SendAsync(request, cancellationToken); response.EnsureSuccessStatusCode(); @@ -30,38 +38,55 @@ namespace testOauthClient.Controllers } } - + [HttpPost] public async Task PostDeviceInfo(CancellationToken cancellationToken) { - /* using (var client = new HttpClient()) { - var request = new HttpRequestMessage(HttpMethod.Post, "http://dev.pschneider.fr/api/gcm/register"); - - request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken); - var json = JsonConvert. - SerializeObject(new Yavsc.Models.Identity.GoogleCloudMobileDeclaration { DeviceId= "devid01", GCMRegistrationId = "1234" } ); - var content = new StringContent(json, Encoding.UTF8, "application/json"); - var response = await client.SendAsync(request, cancellationToken); - response.EnsureSuccessStatusCode(); + /* + using (var client = new HttpClient()) { + var request = new HttpRequestMessage(HttpMethod.Post, "http://dev.pschneider.fr/api/gcm/register"); - return View("Index", model: await response.Content.ReadAsStringAsync()); - }*/ - var res = await new SimpleJsonPostMethod( - "http://dev.pschneider.fr/api/gcm/register", - "Authorization: Bearer "+AccessToken).InvokeJson( new { - GCMRegistrationId = "testGoogleRegistrationIdValue", - DeviceId = "TestDeviceId", - Model = "TestModel", - Platform = "External Web", - Version = "0.0.1-rc1" - } ); - return Json(res); + request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken); + var json = JsonConvert. + SerializeObject(new Yavsc.Models.Identity.GoogleCloudMobileDeclaration { DeviceId= "devid01", GCMRegistrationId = "1234" } ); + var content = new StringContent(json, Encoding.UTF8, "application/json"); + var response = await client.SendAsync(request, cancellationToken); + response.EnsureSuccessStatusCode(); + + return View("Index", model: await response.Content.ReadAsStringAsync()); + }*/ + JsonValue result = null; + var authHeader = $"Bearer {AccessToken}"; + _logger.LogWarning($"using authorization Header {authHeader}"); + try { + + + using (var request = new SimpleJsonPostMethod( + "http://dev.pschneider.fr/api/gcm/register", authHeader)) + { + result = await request.InvokeJson(new + { + GCMRegistrationId = "testGoogleRegistrationIdValue", + DeviceId = "TestDeviceId", + Model = "TestModel", + Platform = "External Web", + Version = "0.0.1-rc1" + }); + } + } + catch (Exception ex) { + return View("Index", model: new { error = ex.Message }); + } + return View("Index", model: result?.ToString()); } - - protected string AccessToken { - get { + + protected string AccessToken + { + get + { var claim = HttpContext.User?.FindFirst("access_token"); - if (claim == null) { + if (claim == null) + { throw new InvalidOperationException("no access_token"); } diff --git a/testOauthClient/gulpfile.js b/testOauthClient/gulpfile.js index 4490bb1a..1ff01afd 100755 --- a/testOauthClient/gulpfile.js +++ b/testOauthClient/gulpfile.js @@ -48,3 +48,17 @@ gulp.task("min:css", function () { gulp.task("min", ["min:js", "min:css"]); gulp.task('watch', shell.task(['MONO_OPTIONS=--debug ASPNET_ENV=Development dnx-watch web --configuration=Debug --server.urls=http://*:5002'])) +var program = "testOauthClient"; +var port = 55555; + +gulp.task('default', ['debug']); + +gulp.task('build', function() { + return gulp + .src('./**/*.cs') + .pipe(msc(['-fullpaths', '-debug', '-target:exe', '-out:' + program])); +}); + +gulp.task('debug', ['build'], function(done) { + return mono.debug({ port: port, program: program}, done); +}); \ No newline at end of file diff --git a/testOauthClient/package.json b/testOauthClient/package.json index 2e88ea7e..c61e8c38 100755 --- a/testOauthClient/package.json +++ b/testOauthClient/package.json @@ -1,4 +1,5 @@ { + "licence": "GNU GPL", "name": "testOauthClient", "version": "0.0.0", "devDependencies": {